STYLE: use calculatedType() and zeroGradientType() methods

2023-04-24 16:18:05 +02:00 · 2023-04-24 16:18:05 +02:00 · e967305ef2
commit e967305ef2
parent 09ce87135b
88 changed files with 165 additions and 212 deletions
--- a/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/correctPhi.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/overRhoPimpleDyMFoam/correctPhi.H
@ -29,7 +29,7 @@ if (mesh.changing())
    wordList pcorrTypes
    (
        p.boundaryField().size(),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
    );

    // Set BCs of pcorr to fixed-value for patches at which p is fixed
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/correctPhi.H
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/overBuoyantPimpleDyMFoam/correctPhi.H
@ -29,7 +29,7 @@ if (mesh.changing())
    wordList pcorrTypes
    (
        p.boundaryField().size(),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
    );

    // Set BCs of pcorr to fixed-value for patches at which p is fixed
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H
@ -57,7 +57,7 @@
                    ),
                    solidRegions[i],
                    dimensionedSymmTensor(tkappaByCp().dimensions(), Zero),
-                    zeroGradientFvPatchSymmTensorField::typeName
+                    fvPatchFieldBase::zeroGradientType()
                )
            );

--- a/applications/solvers/heatTransfer/solidFoam/createFields.H
+++ b/applications/solvers/heatTransfer/solidFoam/createFields.H
@ -34,7 +34,7 @@ if (!thermo.isotropic())
            ),
            mesh,
            dimensionedSymmTensor(tkappaByCp().dimensions(), Zero),
-            zeroGradientFvPatchSymmTensorField::typeName
+            fvPatchFieldBase::zeroGradientType()
        )
    );
    volSymmTensorField& aniAlpha = *taniAlpha;
--- a/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/correctPhi.H
+++ b/applications/solvers/incompressible/pimpleFoam/overPimpleDyMFoam/correctPhi.H
@ -24,7 +24,7 @@ if (mesh.changing())
    wordList pcorrTypes
    (
        p.boundaryField().size(),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
    );

    // Set BCs of pcorr to fixed-value for patches at which p is fixed
--- a/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C
+++ b/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C
@ -130,7 +130,7 @@ int main(int argc, char *argv[])
            ),
            mesh,
            dimensionedVector(cloudSU.dimensions()/dimVolume, Zero),
-            zeroGradientFvPatchVectorField::typeName
+            fvPatchFieldBase::zeroGradientType()
        );

        cloudVolSUSu.primitiveFieldRef() = -cloudSU.source()/mesh.V();
--- a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
+++ b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
@ -111,7 +111,7 @@ int main(int argc, char *argv[])
            ),
            mesh,
            dimensionedVector(cloudSU.dimensions()/dimVolume, Zero),
-            zeroGradientFvPatchVectorField::typeName
+            fvPatchFieldBase::zeroGradientType()
        );

        cloudVolSUSu.primitiveFieldRef() = -cloudSU.source()/mesh.V();
--- a/applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C
+++ b/applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C
@ -141,7 +141,7 @@ int main(int argc, char *argv[])
            ),
            mesh,
            dimensionedVector(cloudSU.dimensions()/dimVolume, Zero),
-            zeroGradientFvPatchVectorField::typeName
+            fvPatchFieldBase::zeroGradientType()
        );

        cloudVolSUSu.primitiveFieldRef() = -cloudSU.source()/mesh.V();
--- a/applications/solvers/multiphase/MPPICInterFoam/createFields.H
+++ b/applications/solvers/multiphase/MPPICInterFoam/createFields.H
@ -64,8 +64,7 @@ volScalarField mu
        mesh,
        IOobject::READ_IF_PRESENT
    ),
-    mixture.mu(),
-    calculatedFvPatchScalarField::typeName
+    mixture.mu()
 );


@ -139,7 +138,7 @@ volScalarField alphac
    ),
    mesh,
    dimensionedScalar(dimless, Zero),
-    zeroGradientFvPatchScalarField::typeName
+    fvPatchFieldBase::zeroGradientType()
 );
 alphac.oldTime();

--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/createPcorrTypes.H
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/createPcorrTypes.H
@ -1,7 +1,7 @@
    wordList pcorrTypes
    (
        p.boundaryField().size(),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
    );

    for (label i=0; i<p.boundaryField().size(); i++)
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C
@ -140,7 +140,7 @@ Foam::fv::VoFSolidificationMeltingSource::VoFSolidificationMeltingSource
        ),
        mesh,
        dimensionedScalar(dimless, Zero),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
    ),
    curTimeIndex_(-1)
 {
--- a/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C
+++ b/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C
@ -105,8 +105,7 @@ incompressibleTwoPhaseInteractingMixture
            U_.db()
        ),
        U_.mesh(),
-        dimensionedScalar(dimensionSet(1, -1, -1, 0, 0), Zero),
-        calculatedFvPatchScalarField::typeName
+        dimensionedScalar(dimensionSet(1, -1, -1, 0, 0), Zero)
    )
 {
    correct();
--- a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
+++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
@ -48,7 +48,7 @@ Foam::wordList Foam::relativeVelocityModel::UdmPatchFieldTypes() const
    wordList UdmTypes
    (
        U.boundaryField().size(),
-        calculatedFvPatchScalarField::typeName
+        fvPatchFieldBase::calculatedType()
    );

    forAll(U.boundaryField(), i)
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C
@ -119,8 +119,7 @@ Foam::incompressibleThreePhaseMixture::incompressibleThreePhaseMixture
            U.db()
        ),
        U.mesh(),
-        dimensionedScalar(dimensionSet(0, 2, -1, 0, 0), Zero),
-        calculatedFvPatchScalarField::typeName
+        dimensionedScalar(dimensionSet(0, 2, -1, 0, 0), Zero)
    ),

    nuModel1_
--- a/applications/solvers/multiphase/interFoam/overInterDyMFoam/correctPhi.H
+++ b/applications/solvers/multiphase/interFoam/overInterDyMFoam/correctPhi.H
@ -27,7 +27,7 @@
    wordList pcorrTypes
    (
        p_rgh.boundaryField().size(),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
    );

    for (label i=0; i<p_rgh.boundaryField().size(); i++)
--- a/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/pEqn.H
@ -76,7 +76,7 @@
                mesh
            ),
            fluid.dragCoeff(phase, dragCoeffs())/phase.rho(),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
        );
        dragCoeffi.correctBoundaryConditions();

--- a/applications/test/fieldMapping/Test-fieldMapping.C
+++ b/applications/test/fieldMapping/Test-fieldMapping.C
@ -41,7 +41,6 @@ Description
 #include "mapPolyMesh.H"
 #include "polyTopoChange.H"
 #include "fvCFD.H"
-#include "zeroGradientFvPatchFields.H"
 #include "Random.H"

 using namespace Foam;
@ -93,7 +92,7 @@ int main(int argc, char *argv[])
        ),
        mesh,
        dimensionedScalar("one", dimless, 1.0),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
    );
    Info<< "Writing one field "
        << one.name() << " in " << runTime.timeName() << endl;
@ -131,8 +130,7 @@ int main(int argc, char *argv[])
            IOobject::AUTO_WRITE
        ),
        mesh,
-        dimensionedScalar("one", dimless, 1.0),
-        calculatedFvsPatchScalarField::typeName
+        dimensionedScalar("one", dimless, 1.0)
    );
    Info<< "Writing surface one field "
        << surfaceOne.name() << " in " << runTime.timeName() << endl;
--- a/applications/test/hexRef8/Test-hexRef8.C
+++ b/applications/test/hexRef8/Test-hexRef8.C
@ -41,7 +41,6 @@ Description
 #include "mapPolyMesh.H"
 #include "polyTopoChange.H"
 #include "Random.H"
-#include "zeroGradientFvPatchFields.H"
 #include "calculatedPointPatchFields.H"
 #include "pointConstraints.H"
 #include "fvCFD.H"
@ -99,7 +98,7 @@ int main(int argc, char *argv[])
        ),
        mesh,
        dimensionedScalar("one", dimless, 1.0),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
    );
    Info<< "Writing one field "
        << one.name() << " in " << runTime.timeName() << endl;
@ -137,8 +136,7 @@ int main(int argc, char *argv[])
            IOobject::AUTO_WRITE
        ),
        mesh,
-        dimensionedScalar("one", dimless, 1.0),
-        calculatedFvsPatchScalarField::typeName
+        dimensionedScalar("one", dimless, 1.0)
    );
    Info<< "Writing surface one field "
        << surfaceOne.name() << " in " << runTime.timeName() << endl;
@ -157,8 +155,7 @@ int main(int argc, char *argv[])
            IOobject::AUTO_WRITE
        ),
        pointMesh::New(mesh),
-        dimensionedScalar("one", dimless, 1.0),
-        calculatedPointPatchScalarField::typeName
+        dimensionedScalar("one", dimless, 1.0)
    );
    pointX.primitiveFieldRef() = mesh.points().component(0);
    pointX.correctBoundaryConditions();
--- a/applications/test/mappedPatch/Test-MappedPatch.C
+++ b/applications/test/mappedPatch/Test-MappedPatch.C
@ -59,7 +59,7 @@ int main(int argc, char *argv[])
    wordList patchFieldTypes
    (
        mesh.boundaryMesh().size(),
-        calculatedFvPatchVectorField::typeName
+        fvPatchFieldBase::calculatedType()
    );

    forAll(mesh.boundaryMesh(), patchi)
--- a/applications/test/volField/Test-volField.C
+++ b/applications/test/volField/Test-volField.C
@ -185,7 +185,7 @@ int main(int argc, char *argv[])
        ),
        mesh,
        dimensioned<symmTensor>(dimless, symmTensor::one),
-        zeroGradientFvPatchSymmTensorField::typeName
+        fvPatchFieldBase::zeroGradientType()
    );

    volTensorField tensf
@ -200,7 +200,7 @@ int main(int argc, char *argv[])
        ),
        mesh,
        dimensioned<tensor>(dimless, tensor(1,2,3,4,5,6,7,8,9)),
-        zeroGradientFvPatchScalarField::typeName
+        fvPatchFieldBase::zeroGradientType()
    );

    SolverPerformance<symmTensor> sP =
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C
@ -98,8 +98,8 @@ void Foam::backgroundMeshDecomposition::initialRefinement()
            IOobject::NO_WRITE
        ),
        mesh_,
-        dimensionedScalar("one", dimless, 1.0),
-        zeroGradientFvPatchScalarField::typeName
+        dimensionedScalar(word::null, dimless, 1.0),
+        fvPatchFieldBase::zeroGradientType()
    );

    const conformationSurfaces& geometry = geometryToConformTo_;
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
@ -1098,7 +1098,7 @@ void Foam::conformalVoronoiMesh::writeCellSizes
            ),
            mesh,
            dimensionedScalar(dimLength, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
        );

        scalarField& cellSize = targetCellSize.primitiveFieldRef();
@ -1124,7 +1124,7 @@ void Foam::conformalVoronoiMesh::writeCellSizes
        //     ),
        //     mesh,
        //     dimensionedScalar(dimLength, Zero),
-        //     zeroGradientFvPatchScalarField::typeName
+        //     fvPatchFieldBase::zeroGradientType()
        // );

        // targetCellVolume.primitiveFieldRef() = pow3(cellSize);
@ -1143,7 +1143,7 @@ void Foam::conformalVoronoiMesh::writeCellSizes
        //     ),
        //     mesh,
        //     dimensionedScalar(dimVolume, Zero),
-        //     zeroGradientFvPatchScalarField::typeName
+        //     fvPatchFieldBase::zeroGradientType()
        // );

        // actualCellVolume.primitiveFieldRef() = mesh.cellVolumes();
@ -1162,7 +1162,7 @@ void Foam::conformalVoronoiMesh::writeCellSizes
        //     ),
        //     mesh,
        //     dimensionedScalar(dimLength, Zero),
-        //     zeroGradientFvPatchScalarField::typeName
+        //     fvPatchFieldBase::zeroGradientType()
        // );

        // equivalentCellSize.primitiveFieldRef() = pow
@ -1240,11 +1240,12 @@ void Foam::conformalVoronoiMesh::writeCellAlignments
 //            mesh.polyMesh::instance(),
 //            mesh,
 //            IOobject::NO_READ,
-//            IOobject::AUTO_WRITE
+//            IOobject::NO_WRITE,
+//            IOobject::NO_REGISTER
 //        ),
 //        mesh,
 //        tensor::I,
-//        zeroGradientFvPatchTensorField::typeName
+//        fvPatchFieldBase::zeroGradientType()
 //    );
 //
 //    tensorField& cellAlignment = cellAlignments.primitiveFieldRef();
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C
@ -79,8 +79,8 @@ bool Foam::conformalVoronoiMesh::distributeBackground(const Triangulation& mesh)
                IOobject::NO_WRITE
            ),
            bMesh,
-            dimensionedScalar("weight", dimless, 1e-2),
-            zeroGradientFvPatchScalarField::typeName
+            dimensionedScalar(word::null, dimless, 1e-2),
+            fvPatchFieldBase::zeroGradientType()
        );

        meshSearch cellSearch(bMesh, polyMesh::FACE_PLANES);
--- a/applications/utilities/mesh/manipulation/checkMesh/writeFields.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/writeFields.C
@ -2,7 +2,6 @@
 #include "volFields.H"
 #include "surfaceFields.H"
 #include "polyMeshTools.H"
-#include "zeroGradientFvPatchFields.H"
 #include "syncTools.H"
 #include "tetrahedron.H"
 #include "regionSplit.H"
@ -138,8 +137,7 @@ void writeSurfaceField
            IOobject::NO_REGISTER
        ),
        mesh,
-        dimensionedScalar(dimless, Zero),
-        calculatedFvsPatchScalarField::typeName
+        dimensionedScalar(dimless, Zero)
    );
    fld.primitiveFieldRef() = faceData;
    //fld.correctBoundaryConditions();
@ -197,8 +195,7 @@ void Foam::writeFields
                IOobject::NO_REGISTER
            ),
            mesh,
-            dimensionedScalar(dimless, Zero),
-            calculatedFvPatchScalarField::typeName
+            dimensionedScalar(dimless, Zero)
        );
        //- Take max
        maxFaceToCell(nonOrthoAngle, cellNonOrthoAngle);
@ -235,7 +232,7 @@ void Foam::writeFields
            wordList                                // wanted bc types
            (
                mesh.boundary().size(),
-                calculatedFvPatchScalarField::typeName
+                fvPatchFieldBase::calculatedType()
            ),
            mesh.weights().boundaryField().types()  // current bc types
        );
@ -283,8 +280,7 @@ void Foam::writeFields
                IOobject::NO_REGISTER
            ),
            mesh,
-            dimensionedScalar(dimless, Zero),
-            calculatedFvPatchScalarField::typeName
+            dimensionedScalar(dimless, Zero)
        );
        //- Take max
        maxFaceToCell(faceSkewness, cellSkewness);
@ -321,7 +317,7 @@ void Foam::writeFields
            ),
            mesh,
            dimensionedScalar(dimless, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
        );
        cellDeterminant.primitiveFieldRef() =
            primitiveMeshTools::cellDeterminant
@ -356,7 +352,7 @@ void Foam::writeFields
            ),
            mesh,
            dimensionedScalar(dimless, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
        );


@ -391,7 +387,7 @@ void Foam::writeFields
            ),
            mesh,
            dimensionedScalar(dimless, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
        );

        aspectRatio.ref().field() = cellAspectRatio(mesh);
@ -421,7 +417,7 @@ void Foam::writeFields
            ),
            mesh,
            dimensionedScalar(dimless, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
        );
        const cellShapeList& cellShapes = mesh.cellShapes();
        forAll(cellShapes, cellI)
@ -449,8 +445,7 @@ void Foam::writeFields
                IOobject::NO_REGISTER
            ),
            mesh,
-            dimensionedScalar(dimVolume, Zero),
-            calculatedFvPatchScalarField::typeName
+            dimensionedScalar(dimVolume, Zero)
        );
        V.ref() = mesh.V();
        Info<< "    Writing cell volume to " << V.name() << endl;
@ -480,8 +475,7 @@ void Foam::writeFields
                IOobject::NO_REGISTER
            ),
            mesh,
-            dimensionedScalar(dimless, Zero),
-            calculatedFvPatchScalarField::typeName
+            dimensionedScalar(dimless, Zero)
        );
        //- Take min
        minFaceToCell(faceVolumeRatio, cellVolumeRatio);
@ -516,7 +510,7 @@ void Foam::writeFields
            ),
            mesh,
            dimensionedScalar("minTetVolume", dimless, GREAT),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
        );


@ -582,7 +576,7 @@ void Foam::writeFields
            ),
            mesh,
            dimensionedScalar("minPyrVolume", dimless, GREAT),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
        );

        // Get owner and neighbour pyr volumes
@ -654,8 +648,7 @@ void Foam::writeFields
                IOobject::NO_REGISTER
            ),
            mesh,
-            dimensionedScalar(dimless, Zero),
-            calculatedFvPatchScalarField::typeName
+            dimensionedScalar(dimless, Zero)
        );

        regionSplit rs(mesh);
@ -705,8 +698,7 @@ void Foam::writeFields
                IOobject::NO_REGISTER
            ),
            mesh,
-            dimensionedScalar(scalar(-1)),
-            calculatedFvPatchScalarField::typeName
+            dimensionedScalar(word::null, dimless, -1)
        );

        const cellZoneMesh& czs = mesh.cellZones();
@ -744,8 +736,7 @@ void Foam::writeFields
                IOobject::NO_REGISTER
            ),
            mesh,
-            dimensionedScalar(scalar(-1)),
-            calculatedFvsPatchScalarField::typeName
+            dimensionedScalar(word::null, dimless, -1)
        );

        faceZone.primitiveFieldRef() =
--- a/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
+++ b/applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
@ -100,7 +100,7 @@ label addPatch
            mesh,
            pp,
            dictionary(),   // do not set specialised patchFields
-            calculatedFvPatchField<scalar>::typeName,
+            fvPatchFieldBase::calculatedType(),
            true            // parallel sync'ed addition
        );
    }
--- a/applications/utilities/mesh/manipulation/createPatch/createPatch.C
+++ b/applications/utilities/mesh/manipulation/createPatch/createPatch.C
@ -1028,7 +1028,7 @@ int main(int argc, char *argv[])
                                mesh,
                                ppPtr(),
                                patchDict.subOrEmptyDict("patchFields"),
-                                calculatedFvPatchScalarField::typeName,
+                                fvPatchFieldBase::calculatedType(),
                                true
                            );
                        }
@ -1079,7 +1079,7 @@ int main(int argc, char *argv[])
                                mesh,
                                ppPtr(),
                                patchDict.subOrEmptyDict("patchFields"),
-                                calculatedFvPatchScalarField::typeName,
+                                fvPatchFieldBase::calculatedType(),
                                true
                            );
                        }
@ -1108,7 +1108,7 @@ int main(int argc, char *argv[])
                        mesh,
                        ppPtr(),
                        patchDict.subOrEmptyDict("patchFields"),
-                        calculatedFvPatchScalarField::typeName,
+                        fvPatchFieldBase::calculatedType(),
                        true
                    );
                }
--- a/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
+++ b/applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
@ -76,25 +76,14 @@ tmp<volScalarField> createScalarField
    const labelUList& elems
 )
 {
-    tmp<volScalarField> tfld
+    auto tfld = volScalarField::New
    (
-        new volScalarField
-        (
-            IOobject
-            (
-                name,
-                mesh.time().timeName(),
-                mesh,
-                IOobject::NO_READ,
-                IOobject::AUTO_WRITE,
-                IOobject::NO_REGISTER
-            ),
-            mesh,
-            dimensionedScalar(dimless, Zero),
-            zeroGradientFvPatchScalarField::typeName
-        )
+        name,
+        mesh,
+        dimensionedScalar(dimless, Zero),
+        fvPatchFieldBase::zeroGradientType()
    );
-    volScalarField& fld = tfld.ref();
+    auto& fld = tfld.ref();

    forAll(fld, celli)
    {
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@ -114,7 +114,6 @@ Description
 #include "ReadFields.H"
 #include "mappedWallPolyPatch.H"
 #include "fvMeshTools.H"
-#include "zeroGradientFvPatchFields.H"
 #include "processorMeshes.H"

 using namespace Foam;
@ -1055,7 +1054,7 @@ labelList addRegionPatches
            mesh,
            patch1,
            dictionary(),   //optional per field value
-            calculatedFvPatchField<scalar>::typeName,
+            fvPatchFieldBase::calculatedType(),
            true            //validBoundary
        );

@ -1076,7 +1075,7 @@ labelList addRegionPatches
            mesh,
            patch2,
            dictionary(),   //optional per field value
-            calculatedFvPatchField<scalar>::typeName,
+            fvPatchFieldBase::calculatedType(),
            true            //validBoundary
        );

@ -1433,7 +1432,7 @@ void writeCellToRegion(const fvMesh& mesh, const labelList& cellRegion)
            ),
            mesh,
            dimensionedScalar(dimless, Zero),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
        );
        forAll(cellRegion, celli)
        {
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDryRunWrite.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDryRunWrite.C
@ -5,7 +5,7 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -28,7 +28,6 @@ License
 #include "domainDecompositionDryRun.H"
 #include "foamVtkInternalMeshWriter.H"
 #include "volFields.H"
-#include "zeroGradientFvPatchFields.H"

 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //

@ -51,8 +50,8 @@ void Foam::domainDecompositionDryRun::writeVolField
            IOobject::NO_REGISTER
        ),
        this->mesh(),
-        dimensionedScalar("cellDist", dimless, -1),
-        zeroGradientFvPatchScalarField::typeName
+        dimensionedScalar(word::null, dimless, -1),
+        fvPatchFieldBase::zeroGradientType()
    );

    forAll(procIds, celli)
--- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionWrite.C
+++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionWrite.C
@ -5,7 +5,7 @@
    \\  /    A nd           | www.openfoam.com
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2021 OpenCFD Ltd.
+    Copyright (C) 2021-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -28,7 +28,6 @@ License
 #include "domainDecomposition.H"
 #include "foamVtkInternalMeshWriter.H"
 #include "volFields.H"
-#include "zeroGradientFvPatchFields.H"

 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //

@ -52,8 +51,8 @@ void Foam::domainDecomposition::writeVolField
            IOobject::NO_REGISTER
        ),
        this->mesh(),
-        dimensionedScalar("cellDist", dimless, -1),
-        zeroGradientFvPatchScalarField::typeName
+        dimensionedScalar(word::null, dimless, -1),
+        fvPatchFieldBase::zeroGradientType()
    );

    forAll(procIds, celli)
--- a/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
+++ b/applications/utilities/parallelProcessing/reconstructParMesh/reconstructParMesh.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2022 OpenCFD Ltd.
+    Copyright (C) 2016-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -69,7 +69,6 @@ Usage
 #include "faceCoupleInfo.H"
 #include "fvMeshAdder.H"
 #include "polyTopoChange.H"
-#include "zeroGradientFvPatchFields.H"
 #include "topoSet.H"
 #include "regionProperties.H"
 #include "fvMeshTools.H"
@ -421,8 +420,8 @@ void writeDistribution
                IOobject::NO_REGISTER
            ),
            masterMesh,
-            dimensionedScalar("cellDist", dimless, -1),
-            zeroGradientFvPatchScalarField::typeName
+            dimensionedScalar(word::null, dimless, -1),
+            fvPatchFieldBase::zeroGradientType()
        );

        forAll(cellDecomposition, celli)
--- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
+++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C
@ -6,7 +6,7 @@
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
    Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2022 OpenCFD Ltd.
+    Copyright (C) 2015-2023 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
    This file is part of OpenFOAM.
@ -90,7 +90,6 @@ Usage
 #include "globalIndex.H"
 #include "loadOrCreateMesh.H"
 #include "processorFvPatchField.H"
-#include "zeroGradientFvPatchFields.H"
 #include "topoSet.H"
 #include "regionProperties.H"

@ -418,8 +417,8 @@ void writeDecomposition
            IOobject::NO_REGISTER
        ),
        mesh,
-        dimensionedScalar(name, dimless, -1),
-        zeroGradientFvPatchScalarField::typeName
+        dimensionedScalar(word::null, dimless, -1),
+        fvPatchFieldBase::zeroGradientType()
    );

    forAll(procCells, celli)
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/readFields.H
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/readFields.H
@ -96,7 +96,7 @@ tmp<VolumeField<Type>> makeZeroGradientField
            df.mesh(),
            df.dimensions(),
            std::move(df.field()),
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
        );

        tfield.ref().oriented() = df.oriented();
@ -130,7 +130,7 @@ tmp<VolumeField<Type>> makeZeroGradientField
            df.mesh(),
            df.dimensions(),
            std::move(df.primitiveFieldRef(false)),  // No update accessTime
-            zeroGradientFvPatchScalarField::typeName
+            fvPatchFieldBase::zeroGradientType()
        );

        tfield.ref().oriented() = df.oriented();
--- a/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H
+++ b/applications/utilities/preProcessing/applyBoundaryLayer/createFields.H
@ -52,7 +52,7 @@ volScalarField y
    ),
    mesh,
    dimensionedScalar(dimLength, Zero),
-    zeroGradientFvPatchScalarField::typeName
+    fvPatchFieldBase::zeroGradientType()
 );
 y.primitiveFieldRef() = wallDist::New(mesh).y().primitiveField();
 y.correctBoundaryConditions();
@ -88,7 +88,7 @@ volScalarField mask
    ),
    mesh,
    dimensionedScalar(dimless, Zero),
-    zeroGradientFvPatchScalarField::typeName
+    fvPatchFieldBase::zeroGradientType()
 );


--- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
@ -57,8 +57,7 @@ Foam::LESdelta::LESdelta
            IOobject::NO_WRITE
        ),
        turbulence.mesh(),
-        dimensionedScalar(name, dimLength, SMALL),
-        calculatedFvPatchScalarField::typeName
+        dimensionedScalar(word::null, dimLength, SMALL)
    )
 {}

--- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C
@ -59,8 +59,7 @@ Foam::anisotropicFilter::anisotropicFilter
            mesh
        ),
        mesh,
-        dimensionedVector(dimLength*dimLength, Zero),
-        calculatedFvPatchVectorField::typeName
+        dimensionedVector(dimLength*dimLength, Zero)
    )
 {
    for (direction d=0; d<vector::nComponents; d++)
@ -99,8 +98,7 @@ Foam::anisotropicFilter::anisotropicFilter
            mesh
        ),
        mesh,
-        dimensionedVector(dimLength*dimLength, Zero),
-        calculatedFvPatchScalarField::typeName
+        dimensionedVector(dimLength*dimLength, Zero)
    )
 {
    for (direction d=0; d<vector::nComponents; d++)
--- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C
@ -55,8 +55,7 @@ Foam::laplaceFilter::laplaceFilter(const fvMesh& mesh, scalar widthCoeff)
            mesh
        ),
        mesh,
-        dimensionedScalar(dimLength*dimLength, Zero),
-        calculatedFvPatchScalarField::typeName
+        dimensionedScalar(dimLength*dimLength, Zero)
    )
 {
    coeff_.ref() = pow(mesh.V(), 2.0/3.0)/widthCoeff_;
@ -79,8 +78,7 @@ Foam::laplaceFilter::laplaceFilter(const fvMesh& mesh, const dictionary& bd)
            mesh
        ),
        mesh,
-        dimensionedScalar(dimLength*dimLength, Zero),
-        calculatedFvPatchScalarField::typeName
+        dimensionedScalar(dimLength*dimLength, Zero)
    )
 {
    coeff_.ref() = pow(mesh.V(), 2.0/3.0)/widthCoeff_;
--- a/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C
+++ b/src/TurbulenceModels/turbulenceModels/eddyViscosity/eddyViscosity.C
@ -99,7 +99,7 @@ Foam::eddyViscosity<BasicTurbulenceModel>::R() const
                ->found(patchFieldTypes[i])
        )
        {
-            patchFieldTypes[i] = calculatedFvPatchField<symmTensor>::typeName;
+            patchFieldTypes[i] = fvPatchFieldBase::calculatedType();
        }
    }

--- a/src/finiteArea/faMesh/faMeshSubset/faMeshSubsetTemplates.C
+++ b/src/finiteArea/faMesh/faMeshSubset/faMeshSubsetTemplates.C
@ -58,7 +58,7 @@ Foam::faMeshSubset::interpolate
            patchi,
            faPatchField<Type>::New
            (
-                calculatedFaPatchField<Type>::typeName,
+                faPatchFieldBase::calculatedType(),
                sMesh.boundary()[patchi],
                DimensionedField<Type, areaMesh>::null()
            )
@ -165,7 +165,7 @@ Foam::faMeshSubset::interpolate
            patchi,
            faePatchField<Type>::New
            (
-                calculatedFaePatchField<Type>::typeName,
+                faePatchFieldBase::calculatedType(),
                sMesh.boundary()[patchi],
                DimensionedField<Type, edgeMesh>::null()
            )
--- a/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.C
+++ b/src/finiteArea/finiteArea/d2dt2Schemes/EulerFaD2dt2Scheme/EulerFaD2dt2Scheme.C
@ -114,7 +114,7 @@ EulerFaD2dt2Scheme<Type>::facD2dt2
                d2dt2IOobject,
                mesh(),
                dimensioned<Type>(dt.dimensions()/dimTime/dimTime, Zero),
-                calculatedFaPatchField<Type>::typeName
+                faPatchFieldBase::calculatedType()
            )
        );
    }
--- a/src/finiteArea/finiteArea/ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.C
+++ b/src/finiteArea/finiteArea/ddtSchemes/EulerFaDdtScheme/EulerFaDdtScheme.C
@ -83,7 +83,7 @@ EulerFaDdtScheme<Type>::facDdt
        ddtIOobject,
        mesh(),
        dimensioned<Type>(dt.dimensions()/dimTime, Zero),
-        calculatedFaPatchField<Type>::typeName
+        faPatchFieldBase::calculatedType()
    );
 }

--- a/src/finiteArea/finiteArea/ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.C
+++ b/src/finiteArea/finiteArea/ddtSchemes/backwardFaDdtScheme/backwardFaDdtScheme.C
@ -122,7 +122,7 @@ backwardFaDdtScheme<Type>::facDdt
        ddtIOobject,
        mesh(),
        dimensioned<Type>(dt.dimensions()/dimTime, Zero),
-        calculatedFaPatchField<Type>::typeName
+        faPatchFieldBase::calculatedType()
    );
 }

--- a/src/finiteArea/finiteArea/ddtSchemes/boundedBackwardFaDdtScheme/boundedBackwardFaDdtScheme.C
+++ b/src/finiteArea/finiteArea/ddtSchemes/boundedBackwardFaDdtScheme/boundedBackwardFaDdtScheme.C
@ -105,7 +105,7 @@ tmp<areaScalarField> boundedBackwardFaDdtScheme::facDdt
        ddtIOobject,
        mesh(),
        dimensionedScalar(dt.dimensions()/dimTime, Zero),
-        calculatedFaPatchScalarField::typeName
+        faPatchFieldBase::calculatedType()
    );
 }

--- a/src/finiteVolume/cfdTools/general/include/createRDeltaT.H
+++ b/src/finiteVolume/cfdTools/general/include/createRDeltaT.H
@ -20,7 +20,7 @@ if (LTS)
            ),
            mesh,
            dimensionedScalar("one", dimless/dimTime, 1),
-            extrapolatedCalculatedFvPatchScalarField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
        )
    );
 }
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C
@ -59,7 +59,7 @@ tmp<volScalarField> CoEulerDdtScheme<Type>::CorDeltaT() const
            ),
            mesh(),
            dimensionedScalar(cofrDeltaT.dimensions(), Zero),
-            extrapolatedCalculatedFvPatchScalarField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
        )
    );

@ -189,7 +189,7 @@ CoEulerDdtScheme<Type>::fvcDdt
                ddtIOobject,
                mesh(),
                dimensioned<Type>(dt.dimensions()/dimTime, Zero),
-                calculatedFvPatchField<Type>::typeName
+                fvPatchFieldBase::calculatedType()
            )
        );
    }
--- a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C
@ -81,7 +81,7 @@ EulerDdtScheme<Type>::fvcDdt
        ddtIOobject,
        mesh(),
        dimensioned<Type>(dt.dimensions()/dimTime, Zero),
-        calculatedFvPatchField<Type>::typeName
+        fvPatchFieldBase::calculatedType()
    );
 }

--- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C
@ -109,7 +109,7 @@ tmp<volScalarField> SLTSDdtScheme<Type>::SLrDeltaT() const
            ),
            mesh(),
            dimensionedScalar(dimless/dimTime, Zero),
-            extrapolatedCalculatedFvPatchScalarField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
        )
    );

@ -194,7 +194,7 @@ SLTSDdtScheme<Type>::fvcDdt
                ddtIOobject,
                mesh(),
                dimensioned<Type>(dt.dimensions()/dimTime, Zero),
-                calculatedFvPatchField<Type>::typeName
+                fvPatchFieldBase::calculatedType()
            )
        );
    }
--- a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C
@ -122,7 +122,7 @@ backwardDdtScheme<Type>::fvcDdt
        ddtIOobject,
        mesh(),
        dimensioned<Type>(dt.dimensions()/dimTime, Zero),
-        calculatedFvPatchField<Type>::typeName
+        fvPatchFieldBase::calculatedType()
    );
 }

--- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C
@ -74,7 +74,7 @@ localEulerDdtScheme<Type>::fvcDdt
        ddtIOobject,
        mesh(),
        dimensioned<Type>(dt.dimensions()/dimTime, Zero),
-        calculatedFvPatchField<Type>::typeName
+        fvPatchFieldBase::calculatedType()
    );
 }

--- a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C
@ -60,7 +60,7 @@ Foam::fvc::cellReduce
            ),
            mesh,
            dimensioned<Type>("initialValue", ssf.dimensions(), nullValue),
-            extrapolatedCalculatedFvPatchField<Type>::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
        )
    );

--- a/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C
@ -76,7 +76,7 @@ reconstruct
                IOobject::NO_WRITE
            ),
            inv(surfaceSum(SfHat*mesh.Sf()))&surfaceSum(SfHat*ssf),
-            extrapolatedCalculatedFvPatchField<GradType>::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
        )
    );

--- a/src/finiteVolume/finiteVolume/fvc/fvcReconstructMag.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcReconstructMag.C
@ -69,7 +69,7 @@ tmp<volScalarField> reconstructMag(const surfaceScalarField& ssf)
            ),
            mesh,
            dimensionedScalar(ssf.dimensions()/dimArea, Zero),
-            extrapolatedCalculatedFvPatchScalarField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
        )
    );
    scalarField& rf = treconField.ref();
--- a/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C
@ -78,7 +78,7 @@ reconstruct
            ),
            mesh,
            dimensioned<GradType>(ssf.dimensions()/dimArea, Zero),
-            extrapolatedCalculatedFvPatchField<GradType>::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
        )
    );

--- a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
+++ b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C
@ -101,7 +101,7 @@ surfaceIntegrate
            ),
            mesh,
            dimensioned<Type>(ssf.dimensions()/dimVol, Zero),
-            extrapolatedCalculatedFvPatchField<Type>::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
        )
    );
    GeometricField<Type, fvPatchField, volMesh>& vf = tvf.ref();
@ -152,7 +152,7 @@ surfaceSum
            ),
            mesh,
            dimensioned<Type>(ssf.dimensions(), Zero),
-            extrapolatedCalculatedFvPatchField<Type>::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
        )
    );
    GeometricField<Type, fvPatchField, volMesh>& vf = tvf.ref();
--- a/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/LeastSquaresGrad/LeastSquaresGrad.C
@ -76,7 +76,7 @@ Foam::fv::LeastSquaresGrad<Type, Stencil>::calcGrad
            ),
            mesh,
            dimensioned<GradType>(vtf.dimensions()/dimLength, Zero),
-            extrapolatedCalculatedFvPatchField<GradType>::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
        )
    );
    GradFieldType& lsGrad = tlsGrad.ref();
--- a/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C
@ -66,7 +66,7 @@ Foam::fv::gaussGrad<Type>::gradf
            ),
            mesh,
            dimensioned<GradType>(ssf.dimensions()/dimLength, Zero),
-            extrapolatedCalculatedFvPatchField<GradType>::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
        )
    );
    GradFieldType& gGrad = tgGrad.ref();
--- a/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresGrad.C
@ -72,7 +72,7 @@ Foam::fv::leastSquaresGrad<Type>::calcGrad
            ),
            mesh,
            dimensioned<GradType>(vsf.dimensions()/dimLength, Zero),
-            extrapolatedCalculatedFvPatchField<GradType>::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
        )
    );
    GradFieldType& lsGrad = tlsGrad.ref();
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetTemplates.C
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetTemplates.C
@ -78,7 +78,7 @@ Foam::fvMeshSubset::interpolate
                patchi,
                fvPatchField<Type>::New
                (
-                    calculatedFvPatchField<Type>::typeName,
+                    fvPatchFieldBase::calculatedType(),
                    sMesh.boundary()[patchi],
                    DimensionedField<Type, volMesh>::null()
                )
@ -259,7 +259,7 @@ Foam::fvMeshSubset::interpolate
                patchi,
                fvsPatchField<Type>::New
                (
-                    calculatedFvsPatchField<Type>::typeName,
+                    fvsPatchFieldBase::calculatedType(),
                    sMesh.boundary()[patchi],
                    DimensionedField<Type, surfaceMesh>::null()
                )
@ -446,7 +446,7 @@ Foam::fvMeshSubset::interpolate
                patchi,
                pointPatchField<Type>::New
                (
-                    calculatedPointPatchField<Type>::typeName,
+                    pointPatchFieldBase::calculatedType(),
                    sMesh.boundary()[patchi],
                    DimensionedField<Type, pointMesh>::null()
                )
--- a/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C
+++ b/src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMeshInterpolate.C
@ -53,7 +53,7 @@ tmp<GeometricField<Type, fvPatchField, volMesh>> singleCellFvMesh::interpolate
            patchi,
            fvPatchField<Type>::New
            (
-                calculatedFvPatchField<Type>::typeName,
+                fvPatchFieldBase::calculatedType(),
                boundary()[patchi],
                DimensionedField<Type, volMesh>::null()
            )
--- a/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.C
+++ b/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDist.C
@ -94,7 +94,7 @@ Foam::nearWallDist::nearWallDist(const Foam::fvMesh& mesh)
    (
        mesh.boundary(),
        mesh.V(),           // Dummy internal field,
-        calculatedFvPatchScalarField::typeName
+        fvPatchFieldBase::calculatedType()
    ),
    mesh_(mesh)
 {
@ -125,7 +125,7 @@ void Foam::nearWallDist::correct()
                patchi,
                fvPatchField<scalar>::New
                (
-                    calculatedFvPatchScalarField::typeName,
+                    fvPatchFieldBase::calculatedType(),
                    bnd[patchi],
                    V
                )
--- a/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDistNoSearch.C
+++ b/src/finiteVolume/fvMesh/wallDist/nearWallDist/nearWallDistNoSearch.C
@ -82,7 +82,7 @@ Foam::nearWallDistNoSearch::nearWallDistNoSearch(const Foam::fvMesh& mesh)
    (
        mesh.boundary(),
        mesh.V(),           // Dummy internal field
-        calculatedFvPatchScalarField::typeName
+        fvPatchFieldBase::calculatedType()
    ),
    mesh_(mesh)
 {
--- a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/cellCoBlended/cellCoBlended.H
@ -235,7 +235,7 @@ public:
                ),
                mesh,
                dimensionedScalar(dimless, Zero),
-                extrapolatedCalculatedFvPatchScalarField::typeName
+                fvPatchFieldBase::extrapolatedCalculatedType()
            );

            scalarField sumPhi
--- a/src/functionObjects/field/nearWallFields/nearWallFieldsTemplates.C
+++ b/src/functionObjects/field/nearWallFields/nearWallFieldsTemplates.C
@ -75,7 +75,7 @@ void Foam::functionObjects::nearWallFields::createFields
                        io,
                        fld,
                        patchSet_.toc(),
-                        calculatedFvPatchField<Type>::typeName
+                        fvPatchFieldBase::calculatedType()
                    )
                );

--- a/src/functionObjects/field/pressure/pressure.C
+++ b/src/functionObjects/field/pressure/pressure.C
@ -143,7 +143,7 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::pressure::rhoScale
                IOobject::NO_REGISTER
            ),
            p,
-            fvPatchField<scalar>::calculatedType()
+            fvPatchFieldBase::calculatedType()
        );
    }

--- a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
+++ b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
@ -121,7 +121,7 @@ void Foam::functionObjects::regionSizeDistribution::writeAlphaFields
            IOobject::NO_READ
        ),
        alpha,
-        fvPatchField<scalar>::calculatedType()
+        fvPatchFieldBase::calculatedType()
    );

    volScalarField backgroundAlpha
@ -134,7 +134,7 @@ void Foam::functionObjects::regionSizeDistribution::writeAlphaFields
            IOobject::NO_READ
        ),
        alpha,
-        fvPatchField<scalar>::calculatedType()
+        fvPatchFieldBase::calculatedType()
    );


--- a/src/functionObjects/field/writeCellCentres/writeCellCentres.C
+++ b/src/functionObjects/field/writeCellCentres/writeCellCentres.C
@ -77,7 +77,7 @@ bool Foam::functionObjects::writeCellCentres::write()
    (
        IOobject
        (
-            "C",
+            mesh_.C().name(),
            time_.timeName(),
            mesh_,
            IOobject::NO_READ,
@ -85,11 +85,11 @@ bool Foam::functionObjects::writeCellCentres::write()
            IOobject::NO_REGISTER
        ),
        mesh_.C(),
-        calculatedFvPatchScalarField::typeName
+        fvPatchFieldBase::calculatedType()
    );

    Log << type() << " " << name() << " write:" << nl
-        << "    writing cell-volumes field " << C.name()
+        << "    writing cell-centres field " << C.name()
        << " to " << time_.timeName() << endl;

    C.write();
--- a/src/functionObjects/field/writeCellVolumes/writeCellVolumes.C
+++ b/src/functionObjects/field/writeCellVolumes/writeCellVolumes.C
@ -86,11 +86,13 @@ bool Foam::functionObjects::writeCellVolumes::write()
        ),
        mesh_,
        dimensionedScalar(mesh_.V().dimensions(), Zero),
-        calculatedFvPatchField<scalar>::typeName
+        fvPatchFieldBase::calculatedType()
    );

    V.ref() = mesh_.V();

+    // Without correctBoundaryConditions() - boundary faces have zero volume
+
    Log << type() << " " << name() << " write:" << nl
        << "    writing cell-volumes field " << V.name()
        << " to " << time_.timeName() << endl;
--- a/src/functionObjects/solvers/electricPotential/electricPotential.C
+++ b/src/functionObjects/solvers/electricPotential/electricPotential.C
@ -28,7 +28,6 @@ License
 #include "electricPotential.H"
 #include "fvc.H"
 #include "fvm.H"
-#include "calculatedFvPatchField.H"
 #include "addToRunTimeSelectionTable.H"

 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -95,7 +94,7 @@ Foam::functionObjects::electricPotential::sigma() const
        (
            sigmaIO,
            tsigma,
-            calculatedFvPatchField<scalar>::typeName
+            fvPatchFieldBase::calculatedType()
        );
    }

@ -104,7 +103,7 @@ Foam::functionObjects::electricPotential::sigma() const
        sigmaIO,
        mesh_,
        sigma_,
-        calculatedFvPatchField<scalar>::typeName
+        fvPatchFieldBase::calculatedType()
    );
 }

@ -142,7 +141,7 @@ Foam::functionObjects::electricPotential::epsilonm() const
        (
            epsilonrIO,
            epsilon0*tepsilonr,
-            calculatedFvPatchField<scalar>::typeName
+            fvPatchFieldBase::calculatedType()
        );
    }

@ -151,7 +150,7 @@ Foam::functionObjects::electricPotential::epsilonm() const
        epsilonrIO,
        mesh_,
        epsilon0*epsilonr_,
-        calculatedFvPatchField<scalar>::typeName
+        fvPatchFieldBase::calculatedType()
    );
 }

@ -359,7 +358,7 @@ bool Foam::functionObjects::electricPotential::write()
                IOobject::NO_REGISTER
            ),
            -fvc::grad(eV),
-            calculatedFvPatchField<vector>::typeName
+            fvPatchFieldBase::calculatedType()
        );

        Log << tab << E.name() << endl;
@ -382,7 +381,7 @@ bool Foam::functionObjects::electricPotential::write()
                IOobject::NO_REGISTER
            ),
            -tsigma*fvc::grad(eV),
-            calculatedFvPatchField<vector>::typeName
+            fvPatchFieldBase::calculatedType()
        );

        Log << tab << eJ().name() << endl;
@ -405,7 +404,7 @@ bool Foam::functionObjects::electricPotential::write()
                IOobject::NO_REGISTER
            ),
            fvc::div(tepsilonm*E),
-            calculatedFvPatchField<scalar>::typeName
+            fvPatchFieldBase::calculatedType()
        );

        Log << tab << erho().name() << endl;
--- a/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
+++ b/src/fvOptions/sources/derived/solidificationMeltingSource/solidificationMeltingSource.C
@ -95,7 +95,7 @@ Foam::fv::solidificationMeltingSource::Cp() const
                        dimEnergy/dimMass/dimTemperature,
                        CpRef
                    ),
-                    extrapolatedCalculatedFvPatchScalarField::typeName
+                    fvPatchFieldBase::extrapolatedCalculatedType()
                );
            }
            else
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@ -533,7 +533,7 @@ Foam::KinematicCloud<CloudType>::vDotSweep() const
            ),
            mesh_,
            dimensionedScalar(dimless/dimTime, Zero),
-            extrapolatedCalculatedFvPatchScalarField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
        )
    );

@ -571,7 +571,7 @@ Foam::KinematicCloud<CloudType>::theta() const
            ),
            mesh_,
            dimensionedScalar(dimless, Zero),
-            extrapolatedCalculatedFvPatchScalarField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
        )
    );

--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchCollisionDensity/PatchCollisionDensity.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/PatchCollisionDensity/PatchCollisionDensity.C
@ -91,13 +91,13 @@ Foam::PatchCollisionDensity<CloudType>::PatchCollisionDensity
    (
        this->owner().mesh().boundary(),
        volScalarField::Internal::null(),
-        calculatedFvPatchField<scalar>::typeName
+        fvPatchFieldBase::calculatedType()
    ),
    collisionDensity0_
    (
        this->owner().mesh().boundary(),
        volScalarField::Internal::null(),
-        calculatedFvPatchField<scalar>::typeName
+        fvPatchFieldBase::calculatedType()
    ),
    time0_(this->owner().mesh().time().value())
 {
--- a/src/optimisation/adjointOptimisation/adjoint/global/createZeroField.H
+++ b/src/optimisation/adjointOptimisation/adjoint/global/createZeroField.H
@ -110,7 +110,7 @@ createZeroBoundaryPtr
        (
            mesh.boundary(),
            mesh.V()*pTraits<Type>::zero,  // Dummy internal field,
-            wordList(bm.size(), calculatedFvPatchField<Type>::typeName),
+            wordList(bm.size(), fvPatchFieldBase::calculatedType()),
            actualPatchTypes
        )
    );
--- a/src/parallel/decompose/decompose/fvFieldDecomposerTemplates.C
+++ b/src/parallel/decompose/decompose/fvFieldDecomposerTemplates.C
@ -87,7 +87,7 @@ Foam::fvFieldDecomposer::decomposeField
            patchi,
            fvPatchField<Type>::New
            (
-                calculatedFvPatchField<Type>::typeName,
+                fvPatchFieldBase::calculatedType(),
                procMesh_.boundary()[patchi],
                DimensionedField<Type, volMesh>::null()
            )
@ -260,7 +260,7 @@ Foam::fvFieldDecomposer::decomposeField
            patchi,
            fvsPatchField<Type>::New
            (
-                calculatedFvsPatchField<Type>::typeName,
+                fvsPatchFieldBase::calculatedType(),
                procMesh_.boundary()[patchi],
                DimensionedField<Type, surfaceMesh>::null()
            )
--- a/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/phaseModel/phaseModel.C
+++ b/src/phaseSystemModels/multiphaseEuler/multiphaseSystem/phaseModel/phaseModel.C
@ -155,7 +155,7 @@ Foam::phaseModel::phaseModel
        wordList phiTypes
        (
            U_.boundaryField().size(),
-            calculatedFvPatchScalarField::typeName
+            fvsPatchFieldBase::calculatedType()
        );

        forAll(U_.boundaryField(), i)
--- a/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseInterSystem/multiphaseInterSystem.C
+++ b/src/phaseSystemModels/multiphaseInter/phasesSystem/multiphaseInterSystem/multiphaseInterSystem.C
@ -221,8 +221,7 @@ Foam::multiphaseInterSystem::multiphaseInterSystem
            mesh_
        ),
        mesh_,
-        dimensionedScalar(dimViscosity*dimDensity, Zero),
-        calculatedFvPatchScalarField::typeName
+        dimensionedScalar(dimViscosity*dimDensity, Zero)
    ),
    phaseNames_(get<wordList>("phases")),
    phi_
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/MovingPhaseModel/MovingPhaseModel.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/phaseModel/MovingPhaseModel/MovingPhaseModel.C
@ -85,7 +85,7 @@ Foam::MovingPhaseModel<BasePhaseModel>::phi(const volVectorField& U) const
        wordList phiTypes
        (
            U.boundaryField().size(),
-            calculatedFvPatchScalarField::typeName
+            fvsPatchFieldBase::calculatedType()
        );

        forAll(U.boundaryField(), i)
--- a/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/phaseModel/phaseModel.C
+++ b/src/phaseSystemModels/twoPhaseEuler/twoPhaseSystem/phaseModel/phaseModel.C
@ -154,7 +154,7 @@ Foam::phaseModel::phaseModel
        wordList phiTypes
        (
            U_.boundaryField().size(),
-            calculatedFvPatchScalarField::typeName
+            fvsPatchFieldBase::calculatedType()
        );

        forAll(U_.boundaryField(), i)
--- a/src/regionFaModels/liquidFilm/liquidFilmBase.C
+++ b/src/regionFaModels/liquidFilm/liquidFilmBase.C
@ -188,8 +188,7 @@ liquidFilmBase::liquidFilmBase
            primaryMesh()
        ),
        primaryMesh(),
-        dimensionedScalar(dimMass, Zero),
-        calculatedFvPatchField<scalar>::typeName
+        dimensionedScalar(dimMass, Zero)
    ),

    momentumSource_
@ -201,8 +200,7 @@ liquidFilmBase::liquidFilmBase
            primaryMesh()
        ),
        primaryMesh(),
-        dimensionedVector(dimPressure, Zero),
-        calculatedFvPatchField<vector>::typeName
+        dimensionedVector(dimPressure, Zero)
    ),

    pnSource_
@ -214,8 +212,7 @@ liquidFilmBase::liquidFilmBase
            primaryMesh()
        ),
        primaryMesh(),
-        dimensionedScalar(dimPressure, Zero),
-        calculatedFvPatchField<scalar>::typeName
+        dimensionedScalar(dimPressure, Zero)
    ),

    energySource_
@ -227,8 +224,7 @@ liquidFilmBase::liquidFilmBase
            primaryMesh()
        ),
        primaryMesh(),
-        dimensionedScalar(dimEnergy, Zero),
-        calculatedFvPatchField<scalar>::typeName
+        dimensionedScalar(dimEnergy, Zero)
    ),

    addedMassTotal_(0),
--- a/src/regionFaModels/liquidFilm/liquidFilmModel/liquidFilmModel.C
+++ b/src/regionFaModels/liquidFilm/liquidFilmModel/liquidFilmModel.C
@ -218,8 +218,7 @@ liquidFilmModel::liquidFilmModel
            IOobject::NO_WRITE
        ),
        primaryMesh(),
-        dimensionedScalar(dimMass, Zero),
-        calculatedFvPatchField<scalar>::typeName
+        dimensionedScalar(dimMass, Zero)
    ),

    cloudDiameterTrans_
@ -233,8 +232,7 @@ liquidFilmModel::liquidFilmModel
            IOobject::NO_WRITE
        ),
        primaryMesh(),
-        dimensionedScalar(dimLength, Zero),
-        calculatedFvPatchField<scalar>::typeName
+        dimensionedScalar(dimLength, Zero)
    ),

    turbulence_(filmTurbulenceModel::New(*this, dict)),
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C
@ -275,7 +275,7 @@ tmp<volScalarField> constantFilmThermo::rho() const
            ),
            film().regionMesh(),
            dimensionedScalar(dimDensity, Zero),
-            extrapolatedCalculatedFvPatchScalarField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
        )
    );

--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
@ -258,7 +258,7 @@ tmp<volScalarField> liquidFilmThermo::rho() const
            ),
            film().regionMesh(),
            dimensionedScalar(dimDensity, Zero),
-            extrapolatedCalculatedFvPatchScalarField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
        )
    );

--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C
@ -86,7 +86,7 @@ tmp<volVectorField> laminar::Us() const
            ),
            filmModel_.regionMesh(),
            dimensionedVector(dimVelocity, Zero),
-            extrapolatedCalculatedFvPatchVectorField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
        )
    );

--- a/src/sampling/meshToMesh/meshToMeshTemplates.C
+++ b/src/sampling/meshToMesh/meshToMeshTemplates.C
@ -634,7 +634,7 @@ Foam::meshToMesh::mapSrcToTgt
                tgtPatchi,
                fvPatchField<Type>::New
                (
-                    calculatedFvPatchField<Type>::typeName,
+                    fvPatchFieldBase::calculatedType(),
                    tgtMesh.boundary()[tgtPatchi],
                    DimensionedField<Type, volMesh>::null()
                )
@ -865,7 +865,7 @@ Foam::meshToMesh::mapTgtToSrc
                srcPatchi,
                fvPatchField<Type>::New
                (
-                    calculatedFvPatchField<Type>::typeName,
+                    fvPatchFieldBase::calculatedType(),
                    srcMesh.boundary()[srcPatchi],
                    DimensionedField<Type, volMesh>::null()
                )
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/StandardChemistryModel/StandardChemistryModel.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/StandardChemistryModel/StandardChemistryModel.C
@ -484,8 +484,8 @@ Foam::StandardChemistryModel<ReactionThermo, ThermoType>::tc() const
                IOobject::NO_REGISTER
            ),
            this->mesh(),
-            dimensionedScalar("small", dimTime, SMALL),
-            extrapolatedCalculatedFvPatchScalarField::typeName
+            dimensionedScalar(word::null, dimTime, SMALL),
+            fvPatchFieldBase::extrapolatedCalculatedType()
        )
    );

--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
@ -208,7 +208,7 @@ Foam::radiation::greyMeanAbsorptionEmission::aCont(const label bandI) const
            ),
            mesh(),
            dimensionedScalar(dimless/dimLength, Zero),
-            extrapolatedCalculatedFvPatchVectorField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
        )
    );

--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C
@ -156,7 +156,7 @@ calc(const label propertyId) const
            ),
            mesh(),
            dimensionedScalar(dimless/dimLength, Zero),
-            extrapolatedCalculatedFvPatchVectorField::typeName
+            fvPatchFieldBase::extrapolatedCalculatedType()
        )
    );

--- a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
+++ b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
@ -113,8 +113,7 @@ Foam::incompressibleTwoPhaseMixture::incompressibleTwoPhaseMixture
            U_.db()
        ),
        U_.mesh(),
-        dimensionedScalar(dimViscosity, Zero),
-        calculatedFvPatchScalarField::typeName
+        dimensionedScalar(dimViscosity, Zero)
    )
 {
    calcNu();
--- a/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/controlDict
+++ b/tutorials/verificationAndValidation/schemes/skewnessCavity/setups.orig/common/system/controlDict
@ -71,8 +71,7 @@ functions
                    IOobject::NO_READ
                ),
                mesh(),
-                dimensionedVector(dimless/dimLength, Zero),
-                calculatedFvPatchField<vector>::typeName
+                dimensionedVector(dimless/dimLength, Zero)
            );

            Cc2.primitiveFieldRef() = Cc.primitiveField();
@ -102,8 +101,7 @@ functions
                    IOobject::NO_READ
                ),
                mesh(),
-                dimensionedScalar(dimless, Zero),
-                calculatedFvPatchField<scalar>::typeName
+                dimensionedScalar(dimless, Zero)
            );

            volScalarField magError
@ -116,8 +114,7 @@ functions
                    IOobject::NO_READ
                ),
                mesh(),
-                dimensionedScalar(dimless, Zero),
-                calculatedFvPatchField<scalar>::typeName
+                dimensionedScalar(dimless, Zero)
            );

            const dimensionedScalar root2(dimless/sqr(dimLength), Foam::sqrt(2.0));