Code simplification: GeometricField<Type, fvsPatchField, surfaceMesh> -> SurfaceField<Type>

Using the SurfaceField<Type> partial specialisation of
GeometricField<Type, fvsPatchField, surfaceMesh>
simplifies the code and improves readability.

applications/solvers/compressible/rhoCentralFoam/directionInterpolate.H

@@ -3,14 +3,14 @@ namespace Foam
 
 //- Interpolate field vf according to direction dir
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> interpolate
+tmp<SurfaceField<Type>> interpolate
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
     const surfaceScalarField& dir,
     const word& reconFieldName = word::null
 )
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsf
+    tmp<SurfaceField<Type>> tsf
     (
         fvc::interpolate
         (
@@ -22,7 +22,7 @@ tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> interpolate
         )
     );
 
-    GeometricField<Type, fvsPatchField, surfaceMesh>& sf = tsf.ref();
+    SurfaceField<Type>& sf = tsf.ref();
 
     sf.rename(vf.name() + '_' + dir.name());
 

applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C

@@ -201,7 +201,7 @@ void subsetSurfaceFields
     const label patchi,
     const Type& exposedValue,
     const word GeomSurfType,
-    PtrList<GeometricField<Type, fvsPatchField, surfaceMesh>>& subFields
+    PtrList<SurfaceField<Type>>& subFields
 )
 {
     const fvMesh& baseMesh = subsetter.baseMesh();
@@ -216,7 +216,7 @@ void subsetSurfaceFields
 
             Info<< "Subsetting field " << fieldName << endl;
 
-            GeometricField<Type, fvsPatchField, surfaceMesh> volField
+            SurfaceField<Type> volField
             (
                 *iter(),
                 baseMesh

applications/utilities/mesh/manipulation/subsetMesh/subsetMesh.C

@@ -86,7 +86,7 @@ void subsetSurfaceFields
 (
     const fvMeshSubset& subsetter,
     const wordList& fieldNames,
-    PtrList<GeometricField<Type, fvsPatchField, surfaceMesh>>& subFields
+    PtrList<SurfaceField<Type>>& subFields
 )
 {
     const fvMesh& baseMesh = subsetter.baseMesh();
@@ -97,7 +97,7 @@ void subsetSurfaceFields
 
         Info<< "Subsetting field " << fieldName << endl;
 
-        GeometricField<Type, fvsPatchField, surfaceMesh> fld
+        SurfaceField<Type> fld
         (
             IOobject
             (

applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H

@@ -154,10 +154,10 @@ public:
 
         //- Decompose surface field
         template<class Type>
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+        tmp<SurfaceField<Type>>
         decomposeField
         (
-            const GeometricField<Type, fvsPatchField, surfaceMesh>& field
+            const SurfaceField<Type>& field
         ) const;
 
         //- Decompose a list of fields

applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposerDecomposeFields.C

@@ -225,7 +225,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvFieldDecomposer::decomposeField
 (
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& field
+    const SurfaceField<Type>& field
 ) const
 {
     const SubList<label> faceAddressingIf
@@ -251,9 +251,9 @@ Foam::fvFieldDecomposer::decomposeField
     }
 
     // Create the processor field with the dummy patch fields
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tresF
+    tmp<SurfaceField<Type>> tresF
     (
-        new GeometricField<Type, fvsPatchField, surfaceMesh>
+        new SurfaceField<Type>
         (
             IOobject
             (
@@ -275,11 +275,11 @@ Foam::fvFieldDecomposer::decomposeField
             patchFields
         )
     );
-    GeometricField<Type, fvsPatchField, surfaceMesh>& resF = tresF.ref();
+    SurfaceField<Type>& resF = tresF.ref();
 
     // Change the patch fields to the correct type using a mapper constructor
     // (with reference to the now correct internal field)
-    typename GeometricField<Type, fvsPatchField, surfaceMesh>::
+    typename SurfaceField<Type>::
         Boundary& bf = resF.boundaryFieldRef();
     forAll(procMesh_.boundary(), procPatchi)
     {

applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructor.H

@@ -167,16 +167,16 @@ public:
 
         //- Reconstruct surface field
         template<class Type>
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+        tmp<SurfaceField<Type>>
         reconstructFvSurfaceField
         (
             const IOobject& fieldIoObject,
-            const PtrList<GeometricField<Type, fvsPatchField, surfaceMesh>>&
+            const PtrList<SurfaceField<Type>>&
         ) const;
 
         //- Read and reconstruct surface field
         template<class Type>
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+        tmp<SurfaceField<Type>>
         reconstructFvSurfaceField(const IOobject& fieldIoObject) const;
 
         //- Read, reconstruct and write all/selected volume internal fields

applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructorReconstructFields.C

@@ -306,7 +306,7 @@ Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvFieldReconstructor::reconstructFvSurfaceField
 (
     const IOobject& fieldIoObject,
-    const PtrList<GeometricField<Type, fvsPatchField, surfaceMesh>>& procFields
+    const PtrList<SurfaceField<Type>>& procFields
 ) const
 {
     // Create the internalField
@@ -317,7 +317,7 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
 
     forAll(procMeshes_, proci)
     {
-        const GeometricField<Type, fvsPatchField, surfaceMesh>& procField =
+        const SurfaceField<Type>& procField =
             procFields[proci];
 
         // Set the internal face values in the reconstructed field
@@ -403,9 +403,9 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
     }
 
     // Construct and return the field
-    return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+    return tmp<SurfaceField<Type>>
     (
-        new GeometricField<Type, fvsPatchField, surfaceMesh>
+        new SurfaceField<Type>
         (
             fieldIoObject,
             completeMesh_,
@@ -424,7 +424,7 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
     const IOobject& fieldIoObject
 ) const
 {
-    PtrList<GeometricField<Type, fvsPatchField, surfaceMesh>>
+    PtrList<SurfaceField<Type>>
         procFields(procMeshes_.size());
 
     forAll(procMeshes_, proci)
@@ -432,7 +432,7 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
         procFields.set
         (
             proci,
-            new GeometricField<Type, fvsPatchField, surfaceMesh>
+            new SurfaceField<Type>
             (
                 IOobject
                 (
@@ -543,7 +543,7 @@ void Foam::fvFieldReconstructor::reconstructFvSurfaceFields
 )
 {
     const word& fieldClassName =
-        GeometricField<Type, fvsPatchField, surfaceMesh>::typeName;
+        SurfaceField<Type>::typeName;
 
     IOobjectList fields = objects.lookupClass(fieldClassName);
 

applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C

@@ -455,7 +455,7 @@ void ensightField
     {
         // Interpolates cell values to faces - needed only when exporting
         // faceZones...
-        GeometricField<Type, fvsPatchField, surfaceMesh> sf
+        SurfaceField<Type> sf
         (
             linearInterpolate(vf)
         );

applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -132,7 +132,7 @@ public:
         template<class Type>
         tmp<Field<Type>> getFaceField
         (
-            const GeometricField<Type, fvsPatchField, surfaceMesh>&,
+            const SurfaceField<Type>&,
             const labelList& faceLabels
         ) const;
 

applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -86,7 +86,7 @@ Foam::tmp<Field<Type>> Foam::tecplotWriter::getPatchField
 template<class Type>
 Foam::tmp<Field<Type>> Foam::tecplotWriter::getFaceField
 (
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& sfld,
+    const SurfaceField<Type>& sfld,
     const labelList& faceLabels
 ) const
 {

applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriter.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -92,7 +92,7 @@ public:
         template<class Type>
         tmp<Field<Type>> getFaceField
         (
-            const GeometricField<Type, fvsPatchField, surfaceMesh>&
+            const SurfaceField<Type>&
         ) const;
 
         //- Write surfaceFields
@@ -101,7 +101,7 @@ public:
         (
             const UPtrList
             <
-                const GeometricField<Type, fvsPatchField, surfaceMesh>
+                const SurfaceField<Type>
             >&
         );
 };

applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK/surfaceMeshWriterTemplates.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ License
 template<class Type>
 Foam::tmp<Field<Type>> Foam::surfaceMeshWriter::getFaceField
 (
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& sfld
+    const SurfaceField<Type>& sfld
 ) const
 {
     const polyBoundaryMesh& patches = sfld.mesh().boundaryMesh();
@@ -65,13 +65,13 @@ void Foam::surfaceMeshWriter::write
 (
     const UPtrList
     <
-        const GeometricField<Type, fvsPatchField, surfaceMesh>
+        const SurfaceField<Type>
     >& sflds
 )
 {
     forAll(sflds, fieldi)
     {
-        const GeometricField<Type, fvsPatchField, surfaceMesh>& fld =
+        const SurfaceField<Type>& fld =
             sflds[fieldi];
 
         os_ << fld.name() << ' ' << pTraits<Type>::nComponents << ' '

applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoam.H

@@ -591,7 +591,7 @@ class vtkPVFoam
             template<class Type>
             void convertSurfaceField
             (
-                const GeometricField<Type, fvsPatchField, surfaceMesh>& tf,
+                const SurfaceField<Type>& tf,
                 vtkMultiBlockDataSet* output,
                 const arrayRange& range,
                 const label datasetNo,

applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamSurfaceField.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2021 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -116,7 +116,7 @@ void Foam::vtkPVFoam::convertSurfaceField
 template<class Type>
 void Foam::vtkPVFoam::convertSurfaceField
 (
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& tf,
+    const SurfaceField<Type>& tf,
     vtkMultiBlockDataSet* output,
     const arrayRange& range,
     const label datasetNo,
@@ -198,14 +198,14 @@ void Foam::vtkPVFoam::convertSurfaceFields
         if
         (
             iter()->headerClassName()
-         != GeometricField<Type, fvsPatchField, surfaceMesh>::typeName
+         != SurfaceField<Type>::typeName
         )
         {
             continue;
         }
 
         // Load field
-        const GeometricField<Type, fvsPatchField, surfaceMesh> tf
+        const SurfaceField<Type> tf
         (
             *iter(),
             mesh

src/dynamicMesh/fvMeshAdder/fvMeshAdder.H

@@ -96,8 +96,8 @@ class fvMeshAdder
         (
             const mapAddedPolyMesh& meshMap,
 
-            GeometricField<Type, fvsPatchField, surfaceMesh>& fld,
+            SurfaceField<Type>& fld,
-            const GeometricField<Type, fvsPatchField, surfaceMesh>& fldToAdd
+            const SurfaceField<Type>& fldToAdd
         );
 
         //- Update single pointField.

src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C

@@ -313,14 +313,14 @@ void Foam::fvMeshAdder::MapSurfaceField
 (
     const mapAddedPolyMesh& meshMap,
 
-    GeometricField<Type, fvsPatchField, surfaceMesh>& fld,
+    SurfaceField<Type>& fld,
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& fldToAdd
+    const SurfaceField<Type>& fldToAdd
 )
 {
     const fvMesh& mesh = fld.mesh();
     const labelList& oldPatchStarts = meshMap.oldPatchStarts();
 
-    typename GeometricField<Type, fvsPatchField, surfaceMesh>::
+    typename SurfaceField<Type>::
     Boundary& bfld = fld.boundaryFieldRef();
 
     // Internal field

src/dynamicMesh/fvMeshSubset/fvMeshSubset.H

@@ -273,10 +273,10 @@ public:
             //- Map surface field. Optionally negates value if flipping
             //  a face (from exposing an internal face)
             template<class Type>
-            static tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+            static tmp<SurfaceField<Type>>
             interpolate
             (
-                const GeometricField<Type, fvsPatchField, surfaceMesh>&,
+                const SurfaceField<Type>&,
                 const fvMesh& sMesh,
                 const labelList& patchMap,
                 const labelList& cellMap,
@@ -284,10 +284,10 @@ public:
             );
 
             template<class Type>
-            tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+            tmp<SurfaceField<Type>>
             interpolate
             (
-                const GeometricField<Type, fvsPatchField, surfaceMesh>&
+                const SurfaceField<Type>&
             ) const;
 
             //- Map point field

src/dynamicMesh/fvMeshSubset/fvMeshSubsetInterpolate.C

@@ -176,7 +176,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvMeshSubset::interpolate
 (
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& sf,
+    const SurfaceField<Type>& sf,
     const fvMesh& sMesh,
     const labelList& patchMap,
     const labelList& cellMap,
@@ -221,9 +221,9 @@ Foam::fvMeshSubset::interpolate
     }
 
     // Create the complete field from the pieces
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tresF
+    tmp<SurfaceField<Type>> tresF
     (
-        new GeometricField<Type, fvsPatchField, surfaceMesh>
+        new SurfaceField<Type>
         (
             IOobject
             (
@@ -248,12 +248,12 @@ Foam::fvMeshSubset::interpolate
             patchFields
         )
     );
-    GeometricField<Type, fvsPatchField, surfaceMesh>& resF = tresF.ref();
+    SurfaceField<Type>& resF = tresF.ref();
 
     // 2. Change the fvsPatchFields to the correct type using a mapper
     //  constructor (with reference to the now correct internal field)
 
-    typename GeometricField<Type, fvsPatchField, surfaceMesh>::
+    typename SurfaceField<Type>::
         Boundary& bf = resF.boundaryFieldRef();
 
     forAll(bf, patchi)
@@ -340,7 +340,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::fvMeshSubset::interpolate
 (
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& sf
+    const SurfaceField<Type>& sf
 ) const
 {
     return interpolate

src/finiteVolume/cfdTools/general/MRF/MRFZone.H

@@ -219,7 +219,7 @@ public:
 
         //- Zero the MRF region of the given field
         template<class Type>
-        void zero(GeometricField<Type, fvsPatchField, surfaceMesh>& phi) const;
+        void zero(SurfaceField<Type>& phi) const;
 
         //- Update MRFZone faces if the mesh topology changes
         void update();

src/finiteVolume/cfdTools/general/MRF/MRFZoneList.H

@@ -158,9 +158,9 @@ public:
         //- Filter-out the MRF region contribution from the given field
         // setting the corresponding values to zero
         template<class Type>
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> zeroFilter
+        tmp<SurfaceField<Type>> zeroFilter
         (
-            const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>& tphi
+            const tmp<SurfaceField<Type>>& tphi
         ) const;
 
         //- Update MRFZone faces if the mesh topology changes

src/finiteVolume/cfdTools/general/MRF/MRFZoneListTemplates.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2018-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,7 +31,7 @@ template<class Type>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvsPatchField, Foam::surfaceMesh>>
 Foam::MRFZoneList::zeroFilter
 (
-    const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>& tphi
+    const tmp<SurfaceField<Type>>& tphi
 ) const
 {
     if (size())

src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C

@@ -153,7 +153,7 @@ void Foam::MRFZone::makeAbsoluteRhoFlux
 template<class Type>
 void Foam::MRFZone::zero
 (
-    GeometricField<Type, fvsPatchField, surfaceMesh>& phi
+    SurfaceField<Type>& phi
 ) const
 {
     Field<Type>& phii = phi.primitiveFieldRef();
@@ -163,7 +163,7 @@ void Foam::MRFZone::zero
         phii[internalFaces_[i]] = Zero;
     }
 
-    typename GeometricField<Type, fvsPatchField, surfaceMesh>::Boundary& phibf =
+    typename SurfaceField<Type>::Boundary& phibf =
         phi.boundaryFieldRef();
 
     forAll(patchFaces_, patchi)

src/finiteVolume/fields/surfaceFields/surfaceFieldsFwd.H

@@ -54,14 +54,12 @@ class GeometricField;
 template<class Type>
 using SurfaceField = GeometricField<Type, fvsPatchField, surfaceMesh>;
 
-typedef GeometricField<label, fvsPatchField, surfaceMesh> surfaceLabelField;
+typedef SurfaceField<label> surfaceLabelField;
-typedef GeometricField<scalar, fvsPatchField, surfaceMesh> surfaceScalarField;
+typedef SurfaceField<scalar> surfaceScalarField;
-typedef GeometricField<vector, fvsPatchField, surfaceMesh> surfaceVectorField;
+typedef SurfaceField<vector> surfaceVectorField;
-typedef GeometricField<sphericalTensor, fvsPatchField, surfaceMesh>
+typedef SurfaceField<sphericalTensor> surfaceSphericalTensorField;
-    surfaceSphericalTensorField;
+typedef SurfaceField<symmTensor> surfaceSymmTensorField;
-typedef GeometricField<symmTensor, fvsPatchField, surfaceMesh>
+typedef SurfaceField<tensor> surfaceTensorField;
-    surfaceSymmTensorField;
-typedef GeometricField<tensor, fvsPatchField, surfaceMesh> surfaceTensorField;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -41,7 +41,7 @@ namespace fv
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 boundedConvectionScheme<Type>::interpolate
 (
     const surfaceScalarField& phi,
@@ -53,7 +53,7 @@ boundedConvectionScheme<Type>::interpolate
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 boundedConvectionScheme<Type>::flux
 (
     const surfaceScalarField& faceFlux,

src/finiteVolume/finiteVolume/convectionSchemes/boundedConvectionScheme/boundedConvectionScheme.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2012-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,13 +97,13 @@ public:
 
     // Member Functions
 
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> interpolate
+        tmp<SurfaceField<Type>> interpolate
         (
             const surfaceScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         ) const;
 
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
+        tmp<SurfaceField<Type>> flux
         (
             const surfaceScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&

src/finiteVolume/finiteVolume/convectionSchemes/convectionScheme/convectionScheme.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -159,14 +159,14 @@ public:
             return mesh_;
         }
 
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+        virtual tmp<SurfaceField<Type>>
         interpolate
         (
             const surfaceScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         ) const = 0;
 
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
+        virtual tmp<SurfaceField<Type>> flux
         (
             const surfaceScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&

src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -48,7 +48,7 @@ gaussConvectionScheme<Type>::interpScheme() const
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 gaussConvectionScheme<Type>::interpolate
 (
     const surfaceScalarField&,
@@ -60,7 +60,7 @@ gaussConvectionScheme<Type>::interpolate
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 gaussConvectionScheme<Type>::flux
 (
     const surfaceScalarField& faceFlux,

src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -104,13 +104,13 @@ public:
 
         const surfaceInterpolationScheme<Type>& interpScheme() const;
 
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> interpolate
+        tmp<SurfaceField<Type>> interpolate
         (
             const surfaceScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         ) const;
 
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
+        tmp<SurfaceField<Type>> flux
         (
             const surfaceScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&

src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionScheme.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ namespace fv
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 multivariateGaussConvectionScheme<Type>::interpolate
 (
     const surfaceScalarField& faceFlux,
@@ -57,7 +57,7 @@ multivariateGaussConvectionScheme<Type>::interpolate
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 multivariateGaussConvectionScheme<Type>::flux
 (
     const surfaceScalarField& faceFlux,

src/finiteVolume/finiteVolume/convectionSchemes/multivariateGaussConvectionScheme/multivariateGaussConvectionScheme.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -98,13 +98,13 @@ public:
             return tinterpScheme_;
         }
 
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> interpolate
+        tmp<SurfaceField<Type>> interpolate
         (
             const surfaceScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&
         ) const;
 
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
+        tmp<SurfaceField<Type>> flux
         (
             const surfaceScalarField&,
             const GeometricField<Type, fvPatchField, volMesh>&

src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C

@@ -553,7 +553,7 @@ tmp<typename CoEulerDdtScheme<Type>::fluxFieldType>
 CoEulerDdtScheme<Type>::fvcDdtUfCorr
 (
     const GeometricField<Type, fvPatchField, volMesh>& U,
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+    const SurfaceField<Type>& Uf
 )
 {
     const surfaceScalarField rDeltaT(fvc::interpolate(CorDeltaT()));
@@ -602,7 +602,7 @@ CoEulerDdtScheme<Type>::fvcDdtUfCorr
 (
     const volScalarField& rho,
     const GeometricField<Type, fvPatchField, volMesh>& U,
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+    const SurfaceField<Type>& Uf
 )
 {
     const surfaceScalarField rDeltaT(fvc::interpolate(CorDeltaT()));

src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.H

@@ -172,7 +172,7 @@ public:
         virtual tmp<fluxFieldType> fvcDdtUfCorr
         (
             const GeometricField<Type, fvPatchField, volMesh>& U,
-            const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+            const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
@@ -185,7 +185,7 @@ public:
         (
             const volScalarField& rho,
             const GeometricField<Type, fvPatchField, volMesh>& U,
-            const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+            const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
@@ -218,7 +218,7 @@ template<>
 tmp<surfaceScalarField> CoEulerDdtScheme<scalar>::fvcDdtUfCorr
 (
     const GeometricField<scalar, fvPatchField, volMesh>& U,
-    const GeometricField<scalar, fvsPatchField, surfaceMesh>& Uf
+    const SurfaceField<scalar>& Uf
 );
 
 template<>

src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C

@@ -1118,7 +1118,7 @@ tmp<typename CrankNicolsonDdtScheme<Type>::fluxFieldType>
 CrankNicolsonDdtScheme<Type>::fvcDdtUfCorr
 (
     const GeometricField<Type, fvPatchField, volMesh>& U,
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+    const SurfaceField<Type>& Uf
 )
 {
     DDt0Field<GeometricField<Type, fvPatchField, volMesh>>& ddt0 =
@@ -1128,8 +1128,8 @@ CrankNicolsonDdtScheme<Type>::fvcDdtUfCorr
             U.dimensions()
         );
 
-    DDt0Field<GeometricField<Type, fvsPatchField, surfaceMesh>>& dUfdt0 =
+    DDt0Field<SurfaceField<Type>>& dUfdt0 =
-        ddt0_<GeometricField<Type, fvsPatchField, surfaceMesh>>
+        ddt0_<SurfaceField<Type>>
         (
             "ddtCorrDdt0(" + Uf.name() + ')',
             Uf.dimensions()
@@ -1226,7 +1226,7 @@ CrankNicolsonDdtScheme<Type>::fvcDdtUfCorr
 (
     const volScalarField& rho,
     const GeometricField<Type, fvPatchField, volMesh>& U,
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+    const SurfaceField<Type>& Uf
 )
 {
     if
@@ -1242,8 +1242,8 @@ CrankNicolsonDdtScheme<Type>::fvcDdtUfCorr
                 rho.dimensions()*U.dimensions()
             );
 
-        DDt0Field<GeometricField<Type, fvsPatchField, surfaceMesh>>& dUfdt0 =
+        DDt0Field<SurfaceField<Type>>& dUfdt0 =
-            ddt0_<GeometricField<Type, fvsPatchField, surfaceMesh>>
+            ddt0_<SurfaceField<Type>>
             (
                 "ddtCorrDdt0(" + Uf.name() + ')',
                 Uf.dimensions()
@@ -1303,8 +1303,8 @@ CrankNicolsonDdtScheme<Type>::fvcDdtUfCorr
                 U.dimensions()
             );
 
-        DDt0Field<GeometricField<Type, fvsPatchField, surfaceMesh>>& dUfdt0 =
+        DDt0Field<SurfaceField<Type>>& dUfdt0 =
-            ddt0_<GeometricField<Type, fvsPatchField, surfaceMesh>>
+            ddt0_<SurfaceField<Type>>
             (
                 "ddtCorrDdt0(" + Uf.name() + ')',
                 Uf.dimensions()

src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.H

@@ -286,7 +286,7 @@ public:
         virtual tmp<fluxFieldType> fvcDdtUfCorr
         (
             const GeometricField<Type, fvPatchField, volMesh>& U,
-            const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+            const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
@@ -299,7 +299,7 @@ public:
         (
             const volScalarField& rho,
             const GeometricField<Type, fvPatchField, volMesh>& U,
-            const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+            const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
@@ -332,7 +332,7 @@ template<>
 tmp<surfaceScalarField> CrankNicolsonDdtScheme<scalar>::fvcDdtUfCorr
 (
     const GeometricField<scalar, fvPatchField, volMesh>& U,
-    const GeometricField<scalar, fvsPatchField, surfaceMesh>& Uf
+    const SurfaceField<scalar>& Uf
 );
 
 template<>

src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C

@@ -266,17 +266,17 @@ EulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 EulerDdtScheme<Type>::fvcDdt
 (
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& sf
+    const SurfaceField<Type>& sf
 )
 {
     const dimensionedScalar rDeltaT = 1.0/mesh().time().deltaT();
 
     const word ddtName("ddt("+sf.name()+')');
 
-    return GeometricField<Type, fvsPatchField, surfaceMesh>::New
+    return SurfaceField<Type>::New
     (
         ddtName,
         rDeltaT*(sf - sf.oldTime())
@@ -443,7 +443,7 @@ tmp<typename EulerDdtScheme<Type>::fluxFieldType>
 EulerDdtScheme<Type>::fvcDdtUfCorr
 (
     const GeometricField<Type, fvPatchField, volMesh>& U,
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+    const SurfaceField<Type>& Uf
 )
 {
     const dimensionedScalar rDeltaT = 1.0/mesh().time().deltaT();
@@ -492,7 +492,7 @@ EulerDdtScheme<Type>::fvcDdtUfCorr
 (
     const volScalarField& rho,
     const GeometricField<Type, fvPatchField, volMesh>& U,
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+    const SurfaceField<Type>& Uf
 )
 {
     const dimensionedScalar rDeltaT = 1.0/mesh().time().deltaT();

src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.H

@@ -114,9 +114,9 @@ public:
             const GeometricField<Type, fvPatchField, volMesh>& psi
         );
 
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> fvcDdt
+        virtual tmp<SurfaceField<Type>> fvcDdt
         (
-            const GeometricField<Type, fvsPatchField, surfaceMesh>&
+            const SurfaceField<Type>&
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
@@ -148,7 +148,7 @@ public:
         virtual tmp<fluxFieldType> fvcDdtUfCorr
         (
             const GeometricField<Type, fvPatchField, volMesh>& U,
-            const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+            const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
@@ -161,7 +161,7 @@ public:
         (
             const volScalarField& rho,
             const GeometricField<Type, fvPatchField, volMesh>& U,
-            const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+            const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
@@ -194,7 +194,7 @@ template<>
 tmp<surfaceScalarField> EulerDdtScheme<scalar>::fvcDdtUfCorr
 (
     const GeometricField<scalar, fvPatchField, volMesh>& U,
-    const GeometricField<scalar, fvsPatchField, surfaceMesh>& Uf
+    const SurfaceField<scalar>& Uf
 );
 
 template<>

src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C

@@ -542,7 +542,7 @@ tmp<typename SLTSDdtScheme<Type>::fluxFieldType>
 SLTSDdtScheme<Type>::fvcDdtUfCorr
 (
     const GeometricField<Type, fvPatchField, volMesh>& U,
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+    const SurfaceField<Type>& Uf
 )
 {
     const surfaceScalarField rDeltaT(fvc::interpolate(SLrDeltaT()));
@@ -592,7 +592,7 @@ SLTSDdtScheme<Type>::fvcDdtUfCorr
 (
     const volScalarField& rho,
     const GeometricField<Type, fvPatchField, volMesh>& U,
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+    const SurfaceField<Type>& Uf
 )
 {
     const surfaceScalarField rDeltaT(fvc::interpolate(SLrDeltaT()));

src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.H

@@ -174,7 +174,7 @@ public:
         virtual tmp<fluxFieldType> fvcDdtUfCorr
         (
             const GeometricField<Type, fvPatchField, volMesh>& U,
-            const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+            const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
@@ -187,7 +187,7 @@ public:
         (
             const volScalarField& rho,
             const GeometricField<Type, fvPatchField, volMesh>& U,
-            const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+            const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
@@ -220,7 +220,7 @@ template<>
 tmp<surfaceScalarField> SLTSDdtScheme<scalar>::fvcDdtUfCorr
 (
     const GeometricField<scalar, fvPatchField, volMesh>& U,
-    const GeometricField<scalar, fvsPatchField, surfaceMesh>& Uf
+    const SurfaceField<scalar>& Uf
 );
 
 template<>

src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C

@@ -638,7 +638,7 @@ tmp<typename backwardDdtScheme<Type>::fluxFieldType>
 backwardDdtScheme<Type>::fvcDdtUfCorr
 (
     const GeometricField<Type, fvPatchField, volMesh>& U,
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+    const SurfaceField<Type>& Uf
 )
 {
     const dimensionedScalar rDeltaT = 1.0/mesh().time().deltaT();
@@ -709,7 +709,7 @@ backwardDdtScheme<Type>::fvcDdtUfCorr
 (
     const volScalarField& rho,
     const GeometricField<Type, fvPatchField, volMesh>& U,
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+    const SurfaceField<Type>& Uf
 )
 {
     const dimensionedScalar rDeltaT = 1.0/mesh().time().deltaT();

src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.H

@@ -175,7 +175,7 @@ public:
         virtual tmp<fluxFieldType> fvcDdtUfCorr
         (
             const GeometricField<Type, fvPatchField, volMesh>& U,
-            const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+            const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
@@ -188,7 +188,7 @@ public:
         (
             const volScalarField& rho,
             const GeometricField<Type, fvPatchField, volMesh>& U,
-            const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+            const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
@@ -221,7 +221,7 @@ template<>
 tmp<surfaceScalarField> backwardDdtScheme<scalar>::fvcDdtUfCorr
 (
     const GeometricField<scalar, fvPatchField, volMesh>& U,
-    const GeometricField<scalar, fvsPatchField, surfaceMesh>& Uf
+    const SurfaceField<scalar>& Uf
 );
 
 template<>

src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.C

@@ -155,7 +155,7 @@ tmp<typename boundedDdtScheme<Type>::fluxFieldType>
 boundedDdtScheme<Type>::fvcDdtUfCorr
 (
     const GeometricField<Type, fvPatchField, volMesh>& U,
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+    const SurfaceField<Type>& Uf
 )
 {
     return scheme_.ref().fvcDdtUfCorr(U, Uf);
@@ -180,7 +180,7 @@ boundedDdtScheme<Type>::fvcDdtUfCorr
 (
     const volScalarField& rho,
     const GeometricField<Type, fvPatchField, volMesh>& U,
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+    const SurfaceField<Type>& Uf
 )
 {
     return scheme_.ref().fvcDdtUfCorr(rho, U, Uf);

src/finiteVolume/finiteVolume/ddtSchemes/boundedDdtScheme/boundedDdtScheme.H

@@ -156,7 +156,7 @@ public:
         virtual tmp<fluxFieldType> fvcDdtUfCorr
         (
             const GeometricField<Type, fvPatchField, volMesh>& U,
-            const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+            const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
@@ -169,7 +169,7 @@ public:
         (
             const volScalarField& rho,
             const GeometricField<Type, fvPatchField, volMesh>& U,
-            const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+            const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
@@ -202,7 +202,7 @@ template<>
 tmp<surfaceScalarField> boundedDdtScheme<scalar>::fvcDdtUfCorr
 (
     const GeometricField<scalar, fvPatchField, volMesh>& U,
-    const GeometricField<scalar, fvsPatchField, surfaceMesh>& Uf
+    const SurfaceField<scalar>& Uf
 );
 
 template<>

src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C

@@ -132,16 +132,16 @@ tmp<fvMatrix<Type>> ddtScheme<Type>::fvmDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> ddtScheme<Type>::fvcDdt
+tmp<SurfaceField<Type>> ddtScheme<Type>::fvcDdt
 (
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& sf
+    const SurfaceField<Type>& sf
 )
 {
     NotImplemented;
 
-    return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+    return tmp<SurfaceField<Type>>
     (
-        GeometricField<Type, fvsPatchField, surfaceMesh>::null()
+        SurfaceField<Type>::null()
     );
 }
 

src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.H

@@ -161,9 +161,9 @@ public:
             const GeometricField<Type, fvPatchField, volMesh>&
         ) = 0;
 
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> fvcDdt
+        virtual tmp<SurfaceField<Type>> fvcDdt
         (
-            const GeometricField<Type, fvsPatchField, surfaceMesh>&
+            const SurfaceField<Type>&
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
@@ -223,7 +223,7 @@ public:
         virtual tmp<fluxFieldType> fvcDdtUfCorr
         (
             const GeometricField<Type, fvPatchField, volMesh>& U,
-            const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+            const SurfaceField<Type>& Uf
         ) = 0;
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
@@ -236,7 +236,7 @@ public:
         (
             const volScalarField& rho,
             const GeometricField<Type, fvPatchField, volMesh>& U,
-            const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+            const SurfaceField<Type>& Uf
         ) = 0;
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr

src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C

@@ -177,17 +177,17 @@ localEulerDdtScheme<Type>::fvcDdt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 localEulerDdtScheme<Type>::fvcDdt
 (
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& sf
+    const SurfaceField<Type>& sf
 )
 {
     const surfaceScalarField& rDeltaT = localRDeltaTf();
 
     const word ddtName("ddt("+sf.name()+')');
 
-    return GeometricField<Type, fvsPatchField, surfaceMesh>::New
+    return SurfaceField<Type>::New
     (
         ddtName,
         rDeltaT*(sf - sf.oldTime())
@@ -365,7 +365,7 @@ tmp<typename localEulerDdtScheme<Type>::fluxFieldType>
 localEulerDdtScheme<Type>::fvcDdtUfCorr
 (
     const GeometricField<Type, fvPatchField, volMesh>& U,
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+    const SurfaceField<Type>& Uf
 )
 {
     const surfaceScalarField rDeltaT(fvc::interpolate(localRDeltaT()));
@@ -431,7 +431,7 @@ localEulerDdtScheme<Type>::fvcDdtUfCorr
 (
     const volScalarField& rho,
     const GeometricField<Type, fvPatchField, volMesh>& U,
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+    const SurfaceField<Type>& Uf
 )
 {
     const surfaceScalarField rDeltaT(fvc::interpolate(localRDeltaT()));

src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.H

@@ -181,9 +181,9 @@ public:
             const GeometricField<Type, fvPatchField, volMesh>& psi
         );
 
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> fvcDdt
+        virtual tmp<SurfaceField<Type>> fvcDdt
         (
-            const GeometricField<Type, fvsPatchField, surfaceMesh>&
+            const SurfaceField<Type>&
         );
 
         virtual tmp<fvMatrix<Type>> fvmDdt
@@ -224,7 +224,7 @@ public:
         virtual tmp<fluxFieldType> fvcDdtUfCorr
         (
             const GeometricField<Type, fvPatchField, volMesh>& U,
-            const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+            const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
@@ -237,7 +237,7 @@ public:
         (
             const volScalarField& rho,
             const GeometricField<Type, fvPatchField, volMesh>& U,
-            const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+            const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
@@ -270,7 +270,7 @@ template<>
 tmp<surfaceScalarField> localEulerDdtScheme<scalar>::fvcDdtUfCorr
 (
     const GeometricField<scalar, fvPatchField, volMesh>& U,
-    const GeometricField<scalar, fvsPatchField, surfaceMesh>& Uf
+    const SurfaceField<scalar>& Uf
 );
 
 template<>

src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.C

@@ -229,7 +229,7 @@ tmp<typename steadyStateDdtScheme<Type>::fluxFieldType>
 steadyStateDdtScheme<Type>::fvcDdtUfCorr
 (
     const GeometricField<Type, fvPatchField, volMesh>& U,
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+    const SurfaceField<Type>& Uf
 )
 {
     return fluxFieldType::New
@@ -274,7 +274,7 @@ steadyStateDdtScheme<Type>::fvcDdtUfCorr
 (
     const volScalarField& rho,
     const GeometricField<Type, fvPatchField, volMesh>& U,
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+    const SurfaceField<Type>& Uf
 )
 {
     return fluxFieldType::New

src/finiteVolume/finiteVolume/ddtSchemes/steadyStateDdtScheme/steadyStateDdtScheme.H

@@ -146,7 +146,7 @@ public:
         virtual tmp<fluxFieldType> fvcDdtUfCorr
         (
             const GeometricField<Type, fvPatchField, volMesh>& U,
-            const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+            const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
@@ -159,7 +159,7 @@ public:
         (
             const volScalarField& rho,
             const GeometricField<Type, fvPatchField, volMesh>& U,
-            const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+            const SurfaceField<Type>& Uf
         );
 
         virtual tmp<fluxFieldType> fvcDdtPhiCorr
@@ -192,7 +192,7 @@ template<>
 tmp<surfaceScalarField> steadyStateDdtScheme<scalar>::fvcDdtUfCorr
 (
     const GeometricField<scalar, fvPatchField, volMesh>& U,
-    const GeometricField<scalar, fvsPatchField, surfaceMesh>& Uf
+    const SurfaceField<scalar>& Uf
 );
 
 template<>

src/finiteVolume/finiteVolume/fvc/fvcAverage.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ template<class Type>
 tmp<GeometricField<Type, fvPatchField, volMesh>>
 average
 (
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& ssf
+    const SurfaceField<Type>& ssf
 )
 {
     const fvMesh& mesh = ssf.mesh();
@@ -90,7 +90,7 @@ template<class Type>
 tmp<GeometricField<Type, fvPatchField, volMesh>>
 average
 (
-    const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>& tssf
+    const tmp<SurfaceField<Type>>& tssf
 )
 {
     tmp<GeometricField<Type, fvPatchField, volMesh>> taverage

src/finiteVolume/finiteVolume/fvc/fvcAverage.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,14 +54,14 @@ namespace fvc
     template<class Type>
     tmp<GeometricField<Type, fvPatchField, volMesh>> average
     (
-        const GeometricField<Type, fvsPatchField, surfaceMesh>&
+        const SurfaceField<Type>&
     );
 
     //- Area-weighted average a surfaceField creating a volField
     template<class Type>
     tmp<GeometricField<Type, fvPatchField, volMesh>> average
     (
-        const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>&
+        const tmp<SurfaceField<Type>>&
     );
 
 

src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C

@@ -35,7 +35,7 @@ template<class Type, class CombineOp>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::fvc::cellReduce
 (
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& ssf,
+    const SurfaceField<Type>& ssf,
     const CombineOp& cop,
     const Type& nullValue
 )
@@ -83,7 +83,7 @@ template<class Type, class CombineOp>
 Foam::tmp<Foam::GeometricField<Type, Foam::fvPatchField, Foam::volMesh>>
 Foam::fvc::cellReduce
 (
-    const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>& tssf,
+    const tmp<SurfaceField<Type>>& tssf,
     const CombineOp& cop,
     const Type& nullValue
 )

src/finiteVolume/finiteVolume/fvc/fvcCellReduce.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,7 +52,7 @@ namespace fvc
     template<class Type, class CombineOp>
     tmp<GeometricField<Type, fvPatchField, volMesh>> cellReduce
     (
-        const GeometricField<Type, fvsPatchField, surfaceMesh>&,
+        const SurfaceField<Type>&,
         const CombineOp& cop,
         const Type& nullValue = pTraits<Type>::zero
     );
@@ -60,7 +60,7 @@ namespace fvc
     template<class Type, class CombineOp>
     tmp<GeometricField<Type, fvPatchField, volMesh>> cellReduce
     (
-        const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>&,
+        const tmp<SurfaceField<Type>>&,
         const CombineOp& cop,
         const Type& nullValue = pTraits<Type>::zero
     );

src/finiteVolume/finiteVolume/fvc/fvcDdt.C

@@ -177,10 +177,10 @@ ddt
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 ddt
 (
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& sf
+    const SurfaceField<Type>& sf
 )
 {
     return fv::ddtScheme<Type>::New
@@ -196,7 +196,7 @@ tmp<GeometricField<typename flux<Type>::type, fvsPatchField, surfaceMesh>>
 ddtCorr
 (
     const GeometricField<Type, fvPatchField, volMesh>& U,
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+    const SurfaceField<Type>& Uf
 )
 {
     return fv::ddtScheme<Type>::New
@@ -239,7 +239,7 @@ ddtCorr
         fvsPatchField,
         surfaceMesh
     >& phi,
-    const autoPtr<GeometricField<Type, fvsPatchField, surfaceMesh>>& Uf
+    const autoPtr<SurfaceField<Type>>& Uf
 )
 {
     if (U.mesh().dynamic())
@@ -259,7 +259,7 @@ ddtCorr
 (
     const volScalarField& rho,
     const GeometricField<Type, fvPatchField, volMesh>& U,
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+    const SurfaceField<Type>& Uf
 )
 {
     return fv::ddtScheme<Type>::New
@@ -304,7 +304,7 @@ ddtCorr
         fvsPatchField,
         surfaceMesh
     >& phi,
-    const autoPtr<GeometricField<Type, fvsPatchField, surfaceMesh>>& Uf
+    const autoPtr<SurfaceField<Type>>& Uf
 )
 {
     if (U.mesh().dynamic())

src/finiteVolume/finiteVolume/fvc/fvcDdt.H

@@ -120,9 +120,9 @@ namespace fvc
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> ddt
+    tmp<SurfaceField<Type>> ddt
     (
-        const GeometricField<Type, fvsPatchField, surfaceMesh>&
+        const SurfaceField<Type>&
     );
 
     template<class Type>
@@ -138,7 +138,7 @@ namespace fvc
     ddtCorr
     (
         const GeometricField<Type, fvPatchField, volMesh>& U,
-        const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+        const SurfaceField<Type>& Uf
     );
 
     template<class Type>
@@ -181,7 +181,7 @@ namespace fvc
             fvsPatchField,
             surfaceMesh
         >& phi,
-        const autoPtr<GeometricField<Type, fvsPatchField, surfaceMesh>>& Uf
+        const autoPtr<SurfaceField<Type>>& Uf
     );
 
     template<class Type>
@@ -198,7 +198,7 @@ namespace fvc
     (
         const volScalarField& rho,
         const GeometricField<Type, fvPatchField, volMesh>& U,
-        const GeometricField<Type, fvsPatchField, surfaceMesh>& Uf
+        const SurfaceField<Type>& Uf
     );
 
     template<class Type>
@@ -243,7 +243,7 @@ namespace fvc
             fvsPatchField,
             surfaceMesh
         >& phi,
-        const autoPtr<GeometricField<Type, fvsPatchField, surfaceMesh>>& Uf
+        const autoPtr<SurfaceField<Type>>& Uf
     );
 }
 

src/finiteVolume/finiteVolume/fvc/fvcDiv.C

@@ -45,7 +45,7 @@ template<class Type>
 tmp<GeometricField<Type, fvPatchField, volMesh>>
 div
 (
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& ssf
+    const SurfaceField<Type>& ssf
 )
 {
     return GeometricField<Type, fvPatchField, volMesh>::New
@@ -60,7 +60,7 @@ template<class Type>
 tmp<GeometricField<Type, fvPatchField, volMesh>>
 div
 (
-    const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>& tssf
+    const tmp<SurfaceField<Type>>& tssf
 )
 {
     tmp<GeometricField<Type, fvPatchField, volMesh>> Div(fvc::div(tssf()));

src/finiteVolume/finiteVolume/fvc/fvcDiv.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -53,13 +53,13 @@ namespace fvc
     template<class Type>
     tmp<GeometricField<Type, fvPatchField, volMesh>> div
     (
-        const GeometricField<Type, fvsPatchField, surfaceMesh>&
+        const SurfaceField<Type>&
     );
 
     template<class Type>
     tmp<GeometricField<Type, fvPatchField, volMesh>> div
     (
-        const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>&
+        const tmp<SurfaceField<Type>>&
     );
 
 

src/finiteVolume/finiteVolume/fvc/fvcFlux.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,14 +57,14 @@ namespace fvc
     tmp<surfaceScalarField> flux(const tmp<volVectorField>& tvvf);
 
     template<class Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
+    tmp<SurfaceField<Type>> flux
     (
         const surfaceScalarField&,
         const tmp<GeometricField<Type, fvPatchField, volMesh>>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
+    tmp<SurfaceField<Type>> flux
     (
         const surfaceScalarField&,
         const GeometricField<Type, fvPatchField, volMesh>&,
@@ -72,7 +72,7 @@ namespace fvc
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
+    tmp<SurfaceField<Type>> flux
     (
         const surfaceScalarField&,
         const GeometricField<Type, fvPatchField, volMesh>&,
@@ -80,7 +80,7 @@ namespace fvc
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
+    tmp<SurfaceField<Type>> flux
     (
         const tmp<surfaceScalarField>&,
         const GeometricField<Type, fvPatchField, volMesh>&,
@@ -88,7 +88,7 @@ namespace fvc
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
+    tmp<SurfaceField<Type>> flux
     (
         const surfaceScalarField&,
         const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
@@ -96,7 +96,7 @@ namespace fvc
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
+    tmp<SurfaceField<Type>> flux
     (
         const tmp<surfaceScalarField>&,
         const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
@@ -105,28 +105,28 @@ namespace fvc
 
 
     template<class Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
+    tmp<SurfaceField<Type>> flux
     (
         const surfaceScalarField&,
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
+    tmp<SurfaceField<Type>> flux
     (
         const tmp<surfaceScalarField>&,
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
+    tmp<SurfaceField<Type>> flux
     (
         const surfaceScalarField&,
         const tmp<GeometricField<Type, fvPatchField, volMesh>>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> flux
+    tmp<SurfaceField<Type>> flux
     (
         const tmp<surfaceScalarField>&,
         const tmp<GeometricField<Type, fvPatchField, volMesh>>&

src/finiteVolume/finiteVolume/fvc/fvcFluxTemplates.C

@@ -40,7 +40,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 flux
 (
     const surfaceScalarField& phi,
@@ -58,7 +58,7 @@ flux
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 flux
 (
     const surfaceScalarField& phi,
@@ -71,7 +71,7 @@ flux
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 flux
 (
     const tmp<surfaceScalarField>& tphi,
@@ -79,7 +79,7 @@ flux
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> Flux
+    tmp<SurfaceField<Type>> Flux
     (
         fvc::flux(tphi(), vf, name)
     );
@@ -89,7 +89,7 @@ flux
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 flux
 (
     const surfaceScalarField& phi,
@@ -97,7 +97,7 @@ flux
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> Flux
+    tmp<SurfaceField<Type>> Flux
     (
         fvc::flux(phi, tvf(), name)
     );
@@ -107,7 +107,7 @@ flux
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 flux
 (
     const tmp<surfaceScalarField>& tphi,
@@ -115,7 +115,7 @@ flux
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> Flux
+    tmp<SurfaceField<Type>> Flux
     (
         fvc::flux(tphi(), tvf(), name)
     );
@@ -126,7 +126,7 @@ flux
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 flux
 (
     const surfaceScalarField& phi,
@@ -141,14 +141,14 @@ flux
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 flux
 (
     const tmp<surfaceScalarField>& tphi,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> Flux
+    tmp<SurfaceField<Type>> Flux
     (
         fvc::flux(tphi(), vf)
     );
@@ -158,14 +158,14 @@ flux
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 flux
 (
     const surfaceScalarField& phi,
     const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
 )
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> Flux
+    tmp<SurfaceField<Type>> Flux
     (
         fvc::flux(phi, tvf())
     );
@@ -175,14 +175,14 @@ flux
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 flux
 (
     const tmp<surfaceScalarField>& tphi,
     const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
 )
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> Flux
+    tmp<SurfaceField<Type>> Flux
     (
         fvc::flux(tphi(), tvf())
     );

src/finiteVolume/finiteVolume/fvc/fvcGrad.C

@@ -50,7 +50,7 @@ tmp
 >
 grad
 (
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& ssf
+    const SurfaceField<Type>& ssf
 )
 {
     return fv::gaussGrad<Type>::gradf(ssf, "grad(" + ssf.name() + ')');
@@ -67,7 +67,7 @@ tmp
 >
 grad
 (
-    const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>& tssf
+    const tmp<SurfaceField<Type>>& tssf
 )
 {
     typedef typename outerProduct<vector, Type>::type GradType;

src/finiteVolume/finiteVolume/fvc/fvcGrad.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,7 +57,7 @@ namespace fvc
         <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
     > grad
     (
-        const GeometricField<Type, fvsPatchField, surfaceMesh>&
+        const SurfaceField<Type>&
     );
 
     template<class Type>
@@ -67,7 +67,7 @@ namespace fvc
         <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
     > grad
     (
-        const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>&
+        const tmp<SurfaceField<Type>>&
     );
 
     template<class Type>

src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,7 +52,7 @@ tmp
 >
 reconstruct
 (
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& ssf
+    const SurfaceField<Type>& ssf
 )
 {
     typedef typename outerProduct<vector, Type>::type GradType;
@@ -95,7 +95,7 @@ tmp
 >
 reconstruct
 (
-    const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>& tssf
+    const tmp<SurfaceField<Type>>& tssf
 )
 {
     typedef typename outerProduct<vector, Type>::type GradType;

src/finiteVolume/finiteVolume/fvc/fvcReconstruct.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,7 +57,7 @@ namespace fvc
         <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
     > reconstruct
     (
-        const GeometricField<Type, fvsPatchField, surfaceMesh>&
+        const SurfaceField<Type>&
     );
 
     template<class Type>
@@ -67,7 +67,7 @@ namespace fvc
         <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
     > reconstruct
     (
-        const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>&
+        const tmp<SurfaceField<Type>>&
     );
 
     tmp<volScalarField> reconstructMag(const surfaceScalarField&);

src/finiteVolume/finiteVolume/fvc/fvcSimpleReconstruct.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -49,7 +49,7 @@ tmp
 >
 reconstruct
 (
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& ssf
+    const SurfaceField<Type>& ssf
 )
 {
     typedef typename outerProduct<vector, Type>::type GradType;
@@ -89,7 +89,7 @@ reconstruct
         rf[nei] -= (Cf[facei] - C[nei])*ssf[facei];
     }
 
-    const typename GeometricField<Type, fvsPatchField, surfaceMesh>::
+    const typename SurfaceField<Type>::
     Boundary& bsf = ssf.boundaryField();
 
     forAll(bsf, patchi)
@@ -124,7 +124,7 @@ tmp
 >
 reconstruct
 (
-    const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>& tssf
+    const tmp<SurfaceField<Type>>& tssf
 )
 {
     typedef typename outerProduct<vector, Type>::type GradType;

src/finiteVolume/finiteVolume/fvc/fvcSnGrad.C

@@ -40,7 +40,7 @@ namespace fvc
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 snGrad
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
@@ -56,14 +56,14 @@ snGrad
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 snGrad
 (
     const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf,
     const word& name
 )
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> SnGrad
+    tmp<SurfaceField<Type>> SnGrad
     (
         fvc::snGrad(tvf(), name)
     );
@@ -73,7 +73,7 @@ snGrad
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 snGrad
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -84,13 +84,13 @@ snGrad
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 snGrad
 (
     const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
 )
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> SnGrad
+    tmp<SurfaceField<Type>> SnGrad
     (
         fvc::snGrad(tvf())
     );

src/finiteVolume/finiteVolume/fvc/fvcSnGrad.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,27 +51,27 @@ namespace Foam
 namespace fvc
 {
     template<class Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> snGrad
+    tmp<SurfaceField<Type>> snGrad
     (
         const GeometricField<Type, fvPatchField, volMesh>&,
         const word& name
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> snGrad
+    tmp<SurfaceField<Type>> snGrad
     (
         const tmp<GeometricField<Type, fvPatchField, volMesh>>&,
         const word& name
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> snGrad
+    tmp<SurfaceField<Type>> snGrad
     (
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> snGrad
+    tmp<SurfaceField<Type>> snGrad
     (
         const tmp<GeometricField<Type, fvPatchField, volMesh>>&
     );

src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,7 +43,7 @@ template<class Type>
 void surfaceIntegrate
 (
     Field<Type>& ivf,
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& ssf
+    const SurfaceField<Type>& ssf
 )
 {
     const fvMesh& mesh = ssf.mesh();
@@ -80,7 +80,7 @@ template<class Type>
 tmp<GeometricField<Type, fvPatchField, volMesh>>
 surfaceIntegrate
 (
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& ssf
+    const SurfaceField<Type>& ssf
 )
 {
     const fvMesh& mesh = ssf.mesh();
@@ -113,7 +113,7 @@ template<class Type>
 tmp<GeometricField<Type, fvPatchField, volMesh>>
 surfaceIntegrate
 (
-    const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>& tssf
+    const tmp<SurfaceField<Type>>& tssf
 )
 {
     tmp<GeometricField<Type, fvPatchField, volMesh>> tvf
@@ -129,7 +129,7 @@ template<class Type>
 tmp<GeometricField<Type, fvPatchField, volMesh>>
 surfaceSum
 (
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& ssf
+    const SurfaceField<Type>& ssf
 )
 {
     const fvMesh& mesh = ssf.mesh();
@@ -177,7 +177,7 @@ surfaceSum
 template<class Type>
 tmp<GeometricField<Type, fvPatchField, volMesh>> surfaceSum
 (
-    const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>& tssf
+    const tmp<SurfaceField<Type>>& tssf
 )
 {
     tmp<GeometricField<Type, fvPatchField, volMesh>> tvf = surfaceSum(tssf());

src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,33 +56,33 @@ namespace fvc
     void surfaceIntegrate
     (
         Field<Type>&,
-        const GeometricField<Type, fvsPatchField, surfaceMesh>&
+        const SurfaceField<Type>&
     );
 
     template<class Type>
     tmp<GeometricField<Type, fvPatchField, volMesh>>
     surfaceIntegrate
     (
-        const GeometricField<Type, fvsPatchField, surfaceMesh>&
+        const SurfaceField<Type>&
     );
 
     template<class Type>
     tmp<GeometricField<Type, fvPatchField, volMesh>>
     surfaceIntegrate
     (
-        const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>&
+        const tmp<SurfaceField<Type>>&
     );
 
     template<class Type>
     tmp<GeometricField<Type, fvPatchField, volMesh>> surfaceSum
     (
-        const GeometricField<Type, fvsPatchField, surfaceMesh>&
+        const SurfaceField<Type>&
     );
 
     template<class Type>
     tmp<GeometricField<Type, fvPatchField, volMesh>> surfaceSum
     (
-        const tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>&
+        const tmp<SurfaceField<Type>>&
     );
 }
 

src/finiteVolume/finiteVolume/fvm/fvmLaplacian.C

@@ -369,7 +369,7 @@ template<class Type>
 tmp<fvMatrix<Type>>
 laplacianCorrection
 (
-    const GeometricField<scalar, fvsPatchField, surfaceMesh>& gamma,
+    const SurfaceField<scalar>& gamma,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {
@@ -389,7 +389,7 @@ template<class Type>
 tmp<fvMatrix<Type>>
 laplacianCorrection
 (
-    const tmp<GeometricField<scalar, fvsPatchField, surfaceMesh>>& tGamma,
+    const tmp<SurfaceField<scalar>>& tGamma,
     const GeometricField<Type, fvPatchField, volMesh>& vf
 )
 {

src/finiteVolume/finiteVolume/fvm/fvmLaplacian.H

@@ -196,14 +196,14 @@ namespace fvm
     template<class Type>
     tmp<fvMatrix<Type>> laplacianCorrection
     (
-        const GeometricField<scalar, fvsPatchField, surfaceMesh>&,
+        const SurfaceField<scalar>&,
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 
     template<class Type>
     tmp<fvMatrix<Type>> laplacianCorrection
     (
-        const tmp<GeometricField<scalar, fvsPatchField, surfaceMesh>>&,
+        const tmp<SurfaceField<scalar>>&,
         const GeometricField<Type, fvPatchField, volMesh>&
     );
 }

src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -40,7 +40,7 @@ Foam::tmp
 >
 Foam::fv::gaussGrad<Type>::gradf
 (
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& ssf,
+    const SurfaceField<Type>& ssf,
     const word& name
 )
 {

src/finiteVolume/finiteVolume/gradSchemes/gaussGrad/gaussGrad.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -118,7 +118,7 @@ public:
             <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
         > gradf
         (
-            const GeometricField<Type, fvsPatchField, surfaceMesh>&,
+            const SurfaceField<Type>&,
             const word& name
         );
 

src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C

@@ -89,7 +89,7 @@ gaussLaplacianScheme<Type, GType>::fvmLaplacianUncorrected
 
 
 template<class Type, class GType>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 gaussLaplacianScheme<Type, GType>::gammaSnGradCorr
 (
     const surfaceVectorField& SfGammaCorr,
@@ -98,9 +98,9 @@ gaussLaplacianScheme<Type, GType>::gammaSnGradCorr
 {
     const fvMesh& mesh = this->mesh();
 
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tgammaSnGradCorr
+    tmp<SurfaceField<Type>> tgammaSnGradCorr
     (
-        GeometricField<Type, fvsPatchField, surfaceMesh>::New
+        SurfaceField<Type>::New
         (
             "gammaSnGradCorr("+vf.name()+')',
             mesh,
@@ -157,7 +157,7 @@ gaussLaplacianScheme<Type, GType>::fvmLaplacian
     const surfaceVectorField Sn(mesh.Sf()/mesh.magSf());
 
     const surfaceVectorField SfGamma(mesh.Sf() & gamma);
-    const GeometricField<scalar, fvsPatchField, surfaceMesh> SfGammaSn
+    const SurfaceField<scalar> SfGammaSn
     (
         SfGamma & Sn
     );
@@ -171,7 +171,7 @@ gaussLaplacianScheme<Type, GType>::fvmLaplacian
     );
     fvMatrix<Type>& fvm = tfvm.ref();
 
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tfaceFluxCorrection
+    tmp<SurfaceField<Type>> tfaceFluxCorrection
         = gammaSnGradCorr(SfGammaCorr, vf);
 
     if (this->tsnGradScheme_().corrected())
@@ -203,7 +203,7 @@ gaussLaplacianScheme<Type, GType>::fvcLaplacian
 
     const surfaceVectorField Sn(mesh.Sf()/mesh.magSf());
     const surfaceVectorField SfGamma(mesh.Sf() & gamma);
-    const GeometricField<scalar, fvsPatchField, surfaceMesh> SfGammaSn
+    const SurfaceField<scalar> SfGammaSn
     (
         SfGamma & Sn
     );

src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,7 +58,7 @@ class gaussLaplacianScheme
 {
     // Private Member Functions
 
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> gammaSnGradCorr
+        tmp<SurfaceField<Type>> gammaSnGradCorr
         (
             const surfaceVectorField& SfGammaCorr,
             const GeometricField<Type, fvPatchField, volMesh>&
@@ -144,7 +144,7 @@ public:
 template<>                                                                     \
 tmp<fvMatrix<Type>> gaussLaplacianScheme<Type, scalar>::fvmLaplacian           \
 (                                                                              \
-    const GeometricField<scalar, fvsPatchField, surfaceMesh>&,                 \
+    const SurfaceField<scalar>&,                 \
     const GeometricField<Type, fvPatchField, volMesh>&                         \
 );                                                                             \
                                                                                \
@@ -152,7 +152,7 @@ template<>                                                                     \
 tmp<GeometricField<Type, fvPatchField, volMesh>>                               \
 gaussLaplacianScheme<Type, scalar>::fvcLaplacian                               \
 (                                                                              \
-    const GeometricField<scalar, fvsPatchField, surfaceMesh>&,                 \
+    const SurfaceField<scalar>&,                 \
     const GeometricField<Type, fvPatchField, volMesh>&                         \
 );
 

src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C

@@ -36,13 +36,13 @@ template<>                                                                     \
 Foam::tmp<Foam::fvMatrix<Foam::Type>>                                          \
 Foam::fv::gaussLaplacianScheme<Foam::Type, Foam::scalar>::fvmLaplacian         \
 (                                                                              \
-    const GeometricField<scalar, fvsPatchField, surfaceMesh>& gamma,           \
+    const SurfaceField<scalar>& gamma,           \
     const GeometricField<Type, fvPatchField, volMesh>& vf                      \
 )                                                                              \
 {                                                                              \
     const fvMesh& mesh = this->mesh();                                         \
                                                                                \
-    GeometricField<scalar, fvsPatchField, surfaceMesh> gammaMagSf              \
+    SurfaceField<scalar> gammaMagSf              \
     (                                                                          \
         gamma*mesh.magSf()                                                     \
     );                                                                         \
@@ -60,7 +60,7 @@ Foam::fv::gaussLaplacianScheme<Foam::Type, Foam::scalar>::fvmLaplacian         \
         if (mesh.schemes().fluxRequired(vf.name()))                            \
         {                                                                      \
             fvm.faceFluxCorrectionPtr() = new                                  \
-            GeometricField<Type, fvsPatchField, surfaceMesh>                   \
+            SurfaceField<Type>                   \
             (                                                                  \
                 gammaMagSf*this->tsnGradScheme_().correction(vf)               \
             );                                                                 \
@@ -91,7 +91,7 @@ template<>                                                                     \
 Foam::tmp<Foam::GeometricField<Foam::Type, Foam::fvPatchField, Foam::volMesh>> \
 Foam::fv::gaussLaplacianScheme<Foam::Type, Foam::scalar>::fvcLaplacian         \
 (                                                                              \
-    const GeometricField<scalar, fvsPatchField, surfaceMesh>& gamma,           \
+    const SurfaceField<scalar>& gamma,           \
     const GeometricField<Type, fvPatchField, volMesh>& vf                      \
 )                                                                              \
 {                                                                              \

src/finiteVolume/finiteVolume/snGradSchemes/CentredFitSnGrad/CentredFitSnGradScheme.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2013-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2013-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -110,7 +110,7 @@ public:
         }
 
         //- Return the explicit correction to the face-interpolate
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+        virtual tmp<SurfaceField<Type>>
         correction
         (
             const GeometricField<Type, fvPatchField, volMesh>& vf
@@ -132,7 +132,7 @@ public:
                     centralWeight_
                 );
 
-            tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> sft
+            tmp<SurfaceField<Type>> sft
             (
                 stencil.weightedSum(vf, cfd.coeffs())
             );

src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.C

@@ -48,8 +48,8 @@ Foam::fv::correctedSnGrad<Type>::fullGradCorrection
 {
     const fvMesh& mesh = this->mesh();
 
-    // construct GeometricField<Type, fvsPatchField, surfaceMesh>
+    // construct SurfaceField<Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tssf =
+    tmp<SurfaceField<Type>> tssf =
         linear<typename outerProduct<vector, Type>::type>(mesh).dotInterpolate
         (
             mesh.nonOrthCorrectionVectors(),
@@ -74,17 +74,17 @@ Foam::fv::correctedSnGrad<Type>::correction
 {
     const fvMesh& mesh = this->mesh();
 
-    // construct GeometricField<Type, fvsPatchField, surfaceMesh>
+    // construct SurfaceField<Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tssf
+    tmp<SurfaceField<Type>> tssf
     (
-        GeometricField<Type, fvsPatchField, surfaceMesh>::New
+        SurfaceField<Type>::New
         (
             "snGradCorr("+vf.name()+')',
             mesh,
             vf.dimensions()*mesh.nonOrthDeltaCoeffs().dimensions()
         )
     );
-    GeometricField<Type, fvsPatchField, surfaceMesh>& ssf = tssf.ref();
+    SurfaceField<Type>& ssf = tssf.ref();
 
     for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++)
     {

src/finiteVolume/finiteVolume/snGradSchemes/correctedSnGrad/correctedSnGrad.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,7 +107,7 @@ public:
 
         //- Return the explicit correction to the correctedSnGrad
         //  for the given field using the gradient of the field
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+        tmp<SurfaceField<Type>>
         fullGradCorrection
         (
             const GeometricField<Type, fvPatchField, volMesh>&
@@ -115,7 +115,7 @@ public:
 
         //- Return the explicit correction to the correctedSnGrad
         //  for the given field using the gradients of the field components
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+        virtual tmp<SurfaceField<Type>>
         correction(const GeometricField<Type, fvPatchField, volMesh>&) const;
 };
 

src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C

@@ -50,10 +50,10 @@ Foam::fv::faceCorrectedSnGrad<Type>::fullGradCorrection
         volPointInterpolation::New(mesh).interpolate(vf)
     );
 
-    // construct GeometricField<Type, fvsPatchField, surfaceMesh>
+    // construct SurfaceField<Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsfCorr
+    tmp<SurfaceField<Type>> tsfCorr
     (
-        GeometricField<Type, fvsPatchField, surfaceMesh>::New
+        SurfaceField<Type>::New
         (
             "snGradCorr("+vf.name()+')',
             mesh,
@@ -124,17 +124,17 @@ Foam::fv::faceCorrectedSnGrad<Type>::correction
 {
     const fvMesh& mesh = this->mesh();
 
-    // construct GeometricField<Type, fvsPatchField, surfaceMesh>
+    // construct SurfaceField<Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tssf
+    tmp<SurfaceField<Type>> tssf
     (
-        GeometricField<Type, fvsPatchField, surfaceMesh>::New
+        SurfaceField<Type>::New
         (
             "snGradCorr("+vf.name()+')',
             mesh,
             vf.dimensions()*mesh.nonOrthDeltaCoeffs().dimensions()
         )
     );
-    GeometricField<Type, fvsPatchField, surfaceMesh>& ssf = tssf.ref();
+    SurfaceField<Type>& ssf = tssf.ref();
 
     for (direction cmpt = 0; cmpt < pTraits<Type>::nComponents; cmpt++)
     {

src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -107,7 +107,7 @@ public:
 
         //- Return the explicit correction to the faceCorrectedSnGrad
         //  for the given field using the gradient of the field
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+        tmp<SurfaceField<Type>>
         fullGradCorrection
         (
             const GeometricField<Type, fvPatchField, volMesh>&
@@ -115,7 +115,7 @@ public:
 
         //- Return the explicit correction to the faceCorrectedSnGrad
         //  for the given field using the gradients of the field components
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+        virtual tmp<SurfaceField<Type>>
         correction(const GeometricField<Type, fvPatchField, volMesh>&) const;
 };
 

src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C

@@ -86,13 +86,13 @@ tmp<surfaceScalarField> limitedSnGrad<Type>::deltaCoeffs
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 limitedSnGrad<Type>::correction
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
 ) const
 {
-    const GeometricField<Type, fvsPatchField, surfaceMesh> corr
+    const SurfaceField<Type> corr
     (
         correctedScheme_().correction(vf)
     );

src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.H

@@ -142,7 +142,7 @@ public:
 
         //- Return the explicit correction to the limitedSnGrad
         //  for the given field
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+        virtual tmp<SurfaceField<Type>>
         correction(const GeometricField<Type, fvPatchField, volMesh>&) const;
 
 

src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,14 +50,14 @@ orthogonalSnGrad<Type>::~orthogonalSnGrad()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 orthogonalSnGrad<Type>::correction
 (
     const GeometricField<Type, fvPatchField, volMesh>&
 ) const
 {
     NotImplemented;
-    return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>(nullptr);
+    return tmp<SurfaceField<Type>>(nullptr);
 }
 
 

src/finiteVolume/finiteVolume/snGradSchemes/orthogonalSnGrad/orthogonalSnGrad.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -103,7 +103,7 @@ public:
 
         //- Return the explicit correction to the orthogonalSnGrad
         //  for the given field
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+        virtual tmp<SurfaceField<Type>>
         correction(const GeometricField<Type, fvPatchField, volMesh>&) const;
 
 

src/finiteVolume/finiteVolume/snGradSchemes/phaseStabilisedSnGrad/phaseStabilisedSnGrad.C

@@ -75,13 +75,13 @@ tmp<surfaceScalarField> phaseStabilisedSnGrad<Type>::deltaCoeffs
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 phaseStabilisedSnGrad<Type>::correction
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
 ) const
 {
-    const GeometricField<Type, fvsPatchField, surfaceMesh> corr
+    const SurfaceField<Type> corr
     (
         correctedScheme_().correction(vf)
     );

src/finiteVolume/finiteVolume/snGradSchemes/phaseStabilisedSnGrad/phaseStabilisedSnGrad.H

@@ -96,7 +96,7 @@ public:
 
         //- Return the explicit correction to the phaseStabilisedSnGrad
         //  for the given field
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+        virtual tmp<SurfaceField<Type>>
         correction(const GeometricField<Type, fvPatchField, volMesh>&) const;
 
 

src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -96,7 +96,7 @@ snGradScheme<Type>::~snGradScheme()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 snGradScheme<Type>::snGrad
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
@@ -106,17 +106,17 @@ snGradScheme<Type>::snGrad
 {
     const fvMesh& mesh = vf.mesh();
 
-    // construct GeometricField<Type, fvsPatchField, surfaceMesh>
+    // construct SurfaceField<Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsf
+    tmp<SurfaceField<Type>> tsf
     (
-        GeometricField<Type, fvsPatchField, surfaceMesh>::New
+        SurfaceField<Type>::New
         (
             snGradName + "("+vf.name()+')',
             mesh,
             vf.dimensions()*tdeltaCoeffs().dimensions()
         )
     );
-    GeometricField<Type, fvsPatchField, surfaceMesh>& ssf = tsf.ref();
+    SurfaceField<Type>& ssf = tsf.ref();
 
     // set reference to difference factors array
     const scalarField& deltaCoeffs = tdeltaCoeffs();
@@ -131,7 +131,7 @@ snGradScheme<Type>::snGrad
             deltaCoeffs[facei]*(vf[neighbour[facei]] - vf[owner[facei]]);
     }
 
-    typename GeometricField<Type, fvsPatchField, surfaceMesh>::
+    typename SurfaceField<Type>::
         Boundary& ssfbf = ssf.boundaryFieldRef();
 
     forAll(vf.boundaryField(), patchi)
@@ -153,7 +153,7 @@ snGradScheme<Type>::snGrad
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 snGradScheme<Type>::sndGrad
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf,
@@ -165,13 +165,13 @@ snGradScheme<Type>::sndGrad
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 snGradScheme<Type>::snGrad
 (
     const GeometricField<Type, fvPatchField, volMesh>& vf
 ) const
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsf
+    tmp<SurfaceField<Type>> tsf
     (
         snGrad(vf, deltaCoeffs(vf))
     );
@@ -186,13 +186,13 @@ snGradScheme<Type>::snGrad
 
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 snGradScheme<Type>::snGrad
 (
     const tmp<GeometricField<Type, fvPatchField, volMesh>>& tvf
 ) const
 {
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsf
+    tmp<SurfaceField<Type>> tsf
     (
         snGrad(tvf())
     );

src/finiteVolume/finiteVolume/snGradSchemes/snGradScheme/snGradScheme.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -122,7 +122,7 @@ public:
 
 
         //- Return the snGrad of the given cell field with the given deltaCoeffs
-        static tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+        static tmp<SurfaceField<Type>>
         snGrad
         (
             const GeometricField<Type, fvPatchField, volMesh>&,
@@ -131,7 +131,7 @@ public:
         );
 
         //- Return the sndGrad of the given cell field
-        static tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+        static tmp<SurfaceField<Type>>
         sndGrad
         (
             const GeometricField<Type, fvPatchField, volMesh>&,
@@ -152,10 +152,10 @@ public:
 
         //- Return the explicit correction to the snGrad
         //  for the given field
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+        virtual tmp<SurfaceField<Type>>
         correction(const GeometricField<Type, fvPatchField, volMesh>&) const
         {
-            return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+            return tmp<SurfaceField<Type>>
             (
                 nullptr
             );
@@ -163,12 +163,12 @@ public:
 
         //- Return the snGrad of the given cell field
         //  with explicit correction
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+        virtual tmp<SurfaceField<Type>>
         snGrad(const GeometricField<Type, fvPatchField, volMesh>&) const;
 
         //- Return the snGrad of the given tmp cell field
         //  with explicit correction
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+        tmp<SurfaceField<Type>>
         snGrad
         (
             const tmp<GeometricField<Type, fvPatchField, volMesh>>&

src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2018 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,14 +50,14 @@ uncorrectedSnGrad<Type>::~uncorrectedSnGrad()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+tmp<SurfaceField<Type>>
 uncorrectedSnGrad<Type>::correction
 (
     const GeometricField<Type, fvPatchField, volMesh>&
 ) const
 {
     NotImplemented;
-    return tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>(nullptr);
+    return tmp<SurfaceField<Type>>(nullptr);
 }
 
 

src/finiteVolume/finiteVolume/snGradSchemes/uncorrectedSnGrad/uncorrectedSnGrad.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2020 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -102,7 +102,7 @@ public:
 
         //- Return the explicit correction to the uncorrectedSnGrad
         //  for the given field
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+        virtual tmp<SurfaceField<Type>>
         correction(const GeometricField<Type, fvPatchField, volMesh>&) const;
 
 

src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C

@@ -356,7 +356,7 @@ Foam::fvMatrix<Type>::fvMatrix(const fvMatrix<Type>& fvm)
     if (fvm.faceFluxCorrectionPtr_)
     {
         faceFluxCorrectionPtr_ = new
-        GeometricField<Type, fvsPatchField, surfaceMesh>
+        SurfaceField<Type>
         (
             *(fvm.faceFluxCorrectionPtr_)
         );
@@ -407,7 +407,7 @@ Foam::fvMatrix<Type>::fvMatrix(const tmp<fvMatrix<Type>>& tfvm)
         else
         {
             faceFluxCorrectionPtr_ = new
-                GeometricField<Type, fvsPatchField, surfaceMesh>
+                SurfaceField<Type>
                 (
                     *(tfvm().faceFluxCorrectionPtr_)
                 );
@@ -971,17 +971,17 @@ flux() const
             << abort(FatalError);
     }
 
-    // construct GeometricField<Type, fvsPatchField, surfaceMesh>
+    // construct SurfaceField<Type>
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tfieldFlux
+    tmp<SurfaceField<Type>> tfieldFlux
     (
-        GeometricField<Type, fvsPatchField, surfaceMesh>::New
+        SurfaceField<Type>::New
         (
             "flux(" + psi_.name() + ')',
             psi_.mesh(),
             dimensions()
         )
     );
-    GeometricField<Type, fvsPatchField, surfaceMesh>& fieldFlux =
+    SurfaceField<Type>& fieldFlux =
         tfieldFlux.ref();
 
     for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
@@ -1020,7 +1020,7 @@ flux() const
         }
     }
 
-    typename GeometricField<Type, fvsPatchField, surfaceMesh>::
+    typename SurfaceField<Type>::
         Boundary& ffbf = fieldFlux.boundaryFieldRef();
 
     forAll(ffbf, patchi)
@@ -1069,7 +1069,7 @@ void Foam::fvMatrix<Type>::operator=(const fvMatrix<Type>& fvmv)
     else if (fvmv.faceFluxCorrectionPtr_)
     {
         faceFluxCorrectionPtr_ =
-            new GeometricField<Type, fvsPatchField, surfaceMesh>
+            new SurfaceField<Type>
             (*fvmv.faceFluxCorrectionPtr_);
     }
 }
@@ -1116,7 +1116,7 @@ void Foam::fvMatrix<Type>::operator+=(const fvMatrix<Type>& fvmv)
     else if (fvmv.faceFluxCorrectionPtr_)
     {
         faceFluxCorrectionPtr_ = new
-        GeometricField<Type, fvsPatchField, surfaceMesh>
+        SurfaceField<Type>
         (
             *fvmv.faceFluxCorrectionPtr_
         );
@@ -1150,7 +1150,7 @@ void Foam::fvMatrix<Type>::operator-=(const fvMatrix<Type>& fvmv)
     else if (fvmv.faceFluxCorrectionPtr_)
     {
         faceFluxCorrectionPtr_ =
-            new GeometricField<Type, fvsPatchField, surfaceMesh>
+            new SurfaceField<Type>
             (-*fvmv.faceFluxCorrectionPtr_);
     }
 }

src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.H

@@ -450,7 +450,7 @@ public:
             tmp<volScalarField> H1() const;
 
             //- Return the face-flux field from the matrix
-            tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+            tmp<SurfaceField<Type>>
                 flux() const;
 
 

src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencil.H

@@ -109,7 +109,7 @@ public:
 
         //- Sum vol field contributions to create face values
         template<class Type>
-        static tmp<GeometricField<Type, fvsPatchField, surfaceMesh>>
+        static tmp<SurfaceField<Type>>
         weightedSum
         (
             const distributionMap& map,

src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCellToFaceStencilTemplates.C

@@ -96,9 +96,9 @@ Foam::extendedCellToFaceStencil::weightedSum
     List<List<Type>> stencilFld;
     collectData(map, stencil, fld, stencilFld);
 
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsfCorr
+    tmp<SurfaceField<Type>> tsfCorr
     (
-        GeometricField<Type, fvsPatchField, surfaceMesh>::New
+        SurfaceField<Type>::New
         (
             fld.name(),
             mesh,
@@ -110,7 +110,7 @@ Foam::extendedCellToFaceStencil::weightedSum
             )
         )
     );
-    GeometricField<Type, fvsPatchField, surfaceMesh>& sf = tsfCorr.ref();
+    SurfaceField<Type>& sf = tsfCorr.ref();
 
     // Internal faces
     for (label facei = 0; facei < mesh.nInternalFaces(); facei++)
@@ -126,7 +126,7 @@ Foam::extendedCellToFaceStencil::weightedSum
 
     // Boundaries. Either constrained or calculated so assign value
     // directly (instead of nicely using operator==)
-    typename GeometricField<Type, fvsPatchField, surfaceMesh>::
+    typename SurfaceField<Type>::
         Boundary& bSfCorr = sf.boundaryFieldRef();
 
     forAll(bSfCorr, patchi)

src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedCentredCellToFaceStencil.H

@@ -110,7 +110,7 @@ public:
 
         //- Sum vol field contributions to create face values
         template<class Type>
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> weightedSum
+        tmp<SurfaceField<Type>> weightedSum
         (
             const GeometricField<Type, fvPatchField, volMesh>& fld,
             const List<List<scalar>>& stencilWeights

src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencil.H

@@ -174,7 +174,7 @@ public:
 
         //- Sum vol field contributions to create face values
         template<class Type>
-        tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> weightedSum
+        tmp<SurfaceField<Type>> weightedSum
         (
             const surfaceScalarField& phi,
             const GeometricField<Type, fvPatchField, volMesh>& fld,

src/finiteVolume/fvMesh/extendedStencil/cellToFace/extendedUpwindCellToFaceStencilTemplates.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Copyright (C) 2011-2019 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2022 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -45,9 +45,9 @@ Foam::extendedUpwindCellToFaceStencil::weightedSum
     List<List<Type>> neiFld;
     collectData(neiMap(), neiStencil(), fld, neiFld);
 
-    tmp<GeometricField<Type, fvsPatchField, surfaceMesh>> tsfCorr
+    tmp<SurfaceField<Type>> tsfCorr
     (
-        GeometricField<Type, fvsPatchField, surfaceMesh>::New
+        SurfaceField<Type>::New
         (
             fld.name(),
             mesh,
@@ -59,7 +59,7 @@ Foam::extendedUpwindCellToFaceStencil::weightedSum
             )
         )
     );
-    GeometricField<Type, fvsPatchField, surfaceMesh>& sf = tsfCorr.ref();
+    SurfaceField<Type>& sf = tsfCorr.ref();
 
     // Internal faces
     for (label facei = 0; facei < mesh.nInternalFaces(); facei++)
@@ -89,7 +89,7 @@ Foam::extendedUpwindCellToFaceStencil::weightedSum
 
     // Boundaries. Either constrained or calculated so assign value
     // directly (instead of nicely using operator==)
-    typename GeometricField<Type, fvsPatchField, surfaceMesh>::
+    typename SurfaceField<Type>::
         Boundary& bSfCorr = sf.boundaryFieldRef();
 
     forAll(bSfCorr, patchi)

src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedCentredFaceToCellStencil.H

@@ -112,7 +112,7 @@ public:
         template<class Type>
         tmp<GeometricField<Type, fvPatchField, volMesh>> weightedSum
         (
-            const GeometricField<Type, fvsPatchField, surfaceMesh>& fld,
+            const SurfaceField<Type>& fld,
             const List<List<scalar>>& stencilWeights
         ) const
         {

src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencil.H

@@ -86,7 +86,7 @@ public:
         (
             const distributionMap& map,
             const labelListList& stencil,
-            const GeometricField<Type, fvsPatchField, surfaceMesh>& fld,
+            const SurfaceField<Type>& fld,
             const List<List<scalar>>& stencilWeights
         );
 };

src/finiteVolume/fvMesh/extendedStencil/faceToCell/extendedFaceToCellStencilTemplates.C

@@ -32,7 +32,7 @@ void Foam::extendedFaceToCellStencil::collectData
 (
     const distributionMap& map,
     const labelListList& stencil,
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& fld,
+    const SurfaceField<Type>& fld,
     List<List<Type>>& stencilFld
 )
 {
@@ -83,7 +83,7 @@ Foam::extendedFaceToCellStencil::weightedSum
 (
     const distributionMap& map,
     const labelListList& stencil,
-    const GeometricField<Type, fvsPatchField, surfaceMesh>& fld,
+    const SurfaceField<Type>& fld,
     const List<List<scalar>>& stencilWeights
 )
 {

src/finiteVolume/interpolation/interpolation/interpolationCellPointFace/interpolationCellPointFace.H

@@ -52,7 +52,7 @@ class interpolationCellPointFace
     // Private Data
 
         //- Linearly interpolated volfield
-        const GeometricField<Type, fvsPatchField, surfaceMesh> psis_;
+        const SurfaceField<Type> psis_;
 
         bool findTet
         (