diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFwd.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFwd.H
new file mode 100644
index 0000000000000000000000000000000000000000..b62f469d4ec7f205503a1123ae5a9e2bf9bf17f8
--- /dev/null
+++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFwd.H
@@ -0,0 +1,64 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | www.openfoam.com
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+ Copyright (C) 2024 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
+
+Description
+ Forward declarations related to GeometricField etc.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Foam_GeometricFieldFwd_H
+#define Foam_GeometricFieldFwd_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Forward Declarations
+
+
+// Geometric internal field
+template<class Type, class GeoMesh>
+class DimensionedField;
+
+// Geometric boundary field
+template<class Type, template<class> class PatchField, class GeoMesh>
+class GeometricBoundaryField;
+
+// Geometric field (internal + boundary)
+template<class Type, template<class> class PatchField, class GeoMesh>
+class GeometricField;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/fields/GeometricFields/pointFields/pointFieldsFwd.H b/src/OpenFOAM/fields/GeometricFields/pointFields/pointFieldsFwd.H
index 7384c3c5407a1deba2f891dd0c0f9e1112650747..5cfb8513863a7b5d7d9aed94fcc017579bf367ec 100644
--- a/src/OpenFOAM/fields/GeometricFields/pointFields/pointFieldsFwd.H
+++ b/src/OpenFOAM/fields/GeometricFields/pointFields/pointFieldsFwd.H
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011 OpenFOAM Foundation
- Copyright (C) 2018-2022 OpenCFD Ltd.
+ Copyright (C) 2018-2024 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -39,24 +39,13 @@ SourceFiles
#define Foam_pointFieldsFwd_H
#include "fieldTypes.H"
+#include "GeometricFieldFwd.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
-// Geometric internal field
-template<class Type, class GeoMesh> class DimensionedField;
-
-// Geometric boundary field
-template<class Type, template<class> class PatchField, class GeoMesh>
-class GeometricBoundaryField;
-
-// Geometric field (internal + boundary)
-template<class Type, template<class> class PatchField, class GeoMesh>
-class GeometricField;
-
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Forward Declarations
@@ -80,13 +69,25 @@ using PointInternalField = DimensionedField<Type, pointMesh>;
// Typedefs
-typedef GeometricField<scalar, pointPatchField, pointMesh> pointScalarField;
-typedef GeometricField<vector, pointPatchField, pointMesh> pointVectorField;
-typedef GeometricField<sphericalTensor, pointPatchField, pointMesh>
+typedef
+ GeometricField<scalar, pointPatchField, pointMesh>
+ pointScalarField;
+
+typedef
+ GeometricField<vector, pointPatchField, pointMesh>
+ pointVectorField;
+
+typedef
+ GeometricField<sphericalTensor, pointPatchField, pointMesh>
pointSphericalTensorField;
-typedef GeometricField<symmTensor, pointPatchField, pointMesh>
+
+typedef
+ GeometricField<symmTensor, pointPatchField, pointMesh>
pointSymmTensorField;
-typedef GeometricField<tensor, pointPatchField, pointMesh> pointTensorField;
+
+typedef
+ GeometricField<tensor, pointPatchField, pointMesh>
+ pointTensorField;
/*---------------------------------------------------------------------------*\
diff --git a/src/finiteArea/fields/areaFields/areaFieldsFwd.H b/src/finiteArea/fields/areaFields/areaFieldsFwd.H
index 202298c2d3bb866445e4680d73d7743bc06a6f39..382bb0bba95987f767e47feab2485d8dbc75b23a 100644
--- a/src/finiteArea/fields/areaFields/areaFieldsFwd.H
+++ b/src/finiteArea/fields/areaFields/areaFieldsFwd.H
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2016-2017 Wikki Ltd
- Copyright (C) 2018-2022 OpenCFD Ltd.
+ Copyright (C) 2018-2024 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -36,23 +36,13 @@ SourceFiles
#define Foam_areaFieldsFwd_H
#include "fieldTypes.H"
+#include "GeometricFieldFwd.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
-// Geometric internal field
-template<class Type, class GeoMesh> class DimensionedField;
-
-// Geometric boundary field
-template<class Type, template<class> class PatchField, class GeoMesh>
-class GeometricBoundaryField;
-
-// Geometric field (internal + boundary)
-template<class Type, template<class> class PatchField, class GeoMesh>
-class GeometricField;
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Forward Declarations
@@ -75,12 +65,25 @@ using AreaInternalField = DimensionedField<Type, areaMesh>;
// Typedefs
-typedef GeometricField<scalar, faPatchField, areaMesh> areaScalarField;
-typedef GeometricField<vector, faPatchField, areaMesh> areaVectorField;
-typedef GeometricField<sphericalTensor, faPatchField, areaMesh>
+typedef
+ GeometricField<scalar, faPatchField, areaMesh>
+ areaScalarField;
+
+typedef
+ GeometricField<vector, faPatchField, areaMesh>
+ areaVectorField;
+
+typedef
+ GeometricField<sphericalTensor, faPatchField, areaMesh>
areaSphericalTensorField;
-typedef GeometricField<symmTensor, faPatchField, areaMesh> areaSymmTensorField;
-typedef GeometricField<tensor, faPatchField, areaMesh> areaTensorField;
+
+typedef
+ GeometricField<symmTensor, faPatchField, areaMesh>
+ areaSymmTensorField;
+
+typedef
+ GeometricField<tensor, faPatchField, areaMesh>
+ areaTensorField;
/*---------------------------------------------------------------------------*\
diff --git a/src/finiteArea/fields/edgeFields/edgeFieldsFwd.H b/src/finiteArea/fields/edgeFields/edgeFieldsFwd.H
index e8ead27a34b9ef4f374045c4170524ee85367be5..d0bdec0e25006ed0c0fd4ab68cb211b104886115 100644
--- a/src/finiteArea/fields/edgeFields/edgeFieldsFwd.H
+++ b/src/finiteArea/fields/edgeFields/edgeFieldsFwd.H
@@ -35,16 +35,13 @@ Description
#define Foam_edgeFieldsFwd_H
#include "fieldTypes.H"
+#include "GeometricFieldFwd.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
-// Geometric field (internal + boundary)
-template<class Type, template<class> class PatchField, class GeoMesh>
-class GeometricField;
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Forward Declarations
@@ -60,12 +57,25 @@ template<class Type> class faePatchField;
// Typedefs
-typedef GeometricField<scalar, faePatchField, edgeMesh> edgeScalarField;
-typedef GeometricField<vector, faePatchField, edgeMesh> edgeVectorField;
-typedef GeometricField<sphericalTensor, faePatchField, edgeMesh>
+typedef
+ GeometricField<scalar, faePatchField, edgeMesh>
+ edgeScalarField;
+
+typedef
+ GeometricField<vector, faePatchField, edgeMesh>
+ edgeVectorField;
+
+typedef
+ GeometricField<sphericalTensor, faePatchField, edgeMesh>
edgeSphericalTensorField;
-typedef GeometricField<symmTensor, faePatchField, edgeMesh> edgeSymmTensorField;
-typedef GeometricField<tensor, faePatchField, edgeMesh> edgeTensorField;
+
+typedef
+ GeometricField<symmTensor, faePatchField, edgeMesh>
+ edgeSymmTensorField;
+
+typedef
+ GeometricField<tensor, faePatchField, edgeMesh>
+ edgeTensorField;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/surfaceFields/slicedSurfaceFieldsFwd.H b/src/finiteVolume/fields/surfaceFields/slicedSurfaceFieldsFwd.H
index 9434756da85bd07f57aaf8b8e1dd489197828693..dfeb3bf6c37a37efdc9eba8aa164b2635cd0c5fa 100644
--- a/src/finiteVolume/fields/surfaceFields/slicedSurfaceFieldsFwd.H
+++ b/src/finiteVolume/fields/surfaceFields/slicedSurfaceFieldsFwd.H
@@ -66,35 +66,28 @@ SlicedGeometricField<Type, fvsPatchField, slicedFvsPatchField, surfaceMesh>;
// Typedefs
typedef
-SlicedGeometricField<scalar, fvsPatchField, slicedFvsPatchField, surfaceMesh>
+ SlicedGeometricField
+ <scalar, fvsPatchField, slicedFvsPatchField, surfaceMesh>
slicedSurfaceScalarField;
typedef
-SlicedGeometricField<vector, fvsPatchField, slicedFvsPatchField, surfaceMesh>
+ SlicedGeometricField
+ <vector, fvsPatchField, slicedFvsPatchField, surfaceMesh>
slicedSurfaceVectorField;
typedef
-SlicedGeometricField
-<
- sphericalTensor,
- fvsPatchField,
- slicedFvsPatchField,
- surfaceMesh
->
+ SlicedGeometricField
+ <sphericalTensor, fvsPatchField, slicedFvsPatchField, surfaceMesh>
slicedSurfaceSphericalTensorField;
typedef
-SlicedGeometricField
-<
- symmTensor,
- fvsPatchField,
- slicedFvsPatchField,
- surfaceMesh
->
+ SlicedGeometricField
+ <symmTensor, fvsPatchField, slicedFvsPatchField, surfaceMesh>
slicedSurfaceSymmTensorField;
typedef
-SlicedGeometricField<tensor, fvsPatchField, slicedFvsPatchField, surfaceMesh>
+ SlicedGeometricField
+ <tensor, fvsPatchField, slicedFvsPatchField, surfaceMesh>
slicedSurfaceTensorField;
diff --git a/src/finiteVolume/fields/surfaceFields/surfaceFieldsFwd.H b/src/finiteVolume/fields/surfaceFields/surfaceFieldsFwd.H
index 1a1dd8a35308d92a59d595f34a5b21795fbe6559..d0caef925e34c49007c563b5861b2cbf3f466702 100644
--- a/src/finiteVolume/fields/surfaceFields/surfaceFieldsFwd.H
+++ b/src/finiteVolume/fields/surfaceFields/surfaceFieldsFwd.H
@@ -38,17 +38,13 @@ SourceFiles
#define Foam_surfaceFieldsFwd_H
#include "fieldTypes.H"
+#include "GeometricFieldFwd.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
-// Geometric field (internal + boundary)
-template<class Type, template<class> class PatchField, class GeoMesh>
-class GeometricField;
-
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Forward Declarations
@@ -63,13 +59,25 @@ using SurfaceField = GeometricField<Type, fvsPatchField, surfaceMesh>;
// Typedefs
-typedef GeometricField<scalar, fvsPatchField, surfaceMesh> surfaceScalarField;
-typedef GeometricField<vector, fvsPatchField, surfaceMesh> surfaceVectorField;
-typedef GeometricField<sphericalTensor, fvsPatchField, surfaceMesh>
+typedef
+ GeometricField<scalar, fvsPatchField, surfaceMesh>
+ surfaceScalarField;
+
+typedef
+ GeometricField<vector, fvsPatchField, surfaceMesh>
+ surfaceVectorField;
+
+typedef
+ GeometricField<sphericalTensor, fvsPatchField, surfaceMesh>
surfaceSphericalTensorField;
-typedef GeometricField<symmTensor, fvsPatchField, surfaceMesh>
+
+typedef
+ GeometricField<symmTensor, fvsPatchField, surfaceMesh>
surfaceSymmTensorField;
-typedef GeometricField<tensor, fvsPatchField, surfaceMesh> surfaceTensorField;
+
+typedef
+ GeometricField<tensor, fvsPatchField, surfaceMesh>
+ surfaceTensorField;
/*---------------------------------------------------------------------------*\
diff --git a/src/finiteVolume/fields/volFields/slicedVolFieldsFwd.H b/src/finiteVolume/fields/volFields/slicedVolFieldsFwd.H
index 95e766c0478734cfeb1a6168f48c9577df14d94a..b7f6eb962d5697519510bcc2dfa60e716ce128ce 100644
--- a/src/finiteVolume/fields/volFields/slicedVolFieldsFwd.H
+++ b/src/finiteVolume/fields/volFields/slicedVolFieldsFwd.H
@@ -65,23 +65,28 @@ SlicedGeometricField<Type, fvPatchField, slicedFvPatchField, volMesh>;
// Typedefs
typedef
-SlicedGeometricField<scalar, fvPatchField, slicedFvPatchField, volMesh>
+ SlicedGeometricField
+ <scalar, fvPatchField, slicedFvPatchField, volMesh>
slicedVolScalarField;
typedef
-SlicedGeometricField<vector, fvPatchField, slicedFvPatchField, volMesh>
+ SlicedGeometricField
+ <vector, fvPatchField, slicedFvPatchField, volMesh>
slicedVolVectorField;
typedef
-SlicedGeometricField<sphericalTensor, fvPatchField, slicedFvPatchField, volMesh>
+ SlicedGeometricField
+ <sphericalTensor, fvPatchField, slicedFvPatchField, volMesh>
slicedVolSphericalTensorField;
typedef
-SlicedGeometricField<symmTensor, fvPatchField, slicedFvPatchField, volMesh>
+ SlicedGeometricField
+ <symmTensor, fvPatchField, slicedFvPatchField, volMesh>
slicedVolSymmTensorField;
typedef
-SlicedGeometricField<tensor, fvPatchField, slicedFvPatchField, volMesh>
+ SlicedGeometricField
+ <tensor, fvPatchField, slicedFvPatchField, volMesh>
slicedVolTensorField;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fields/volFields/volFieldsFwd.H b/src/finiteVolume/fields/volFields/volFieldsFwd.H
index e4daf9f73b85772783ef207d552685a56bb5d415..32bb8d658ee64163623bff9ad9e2f8a016575afd 100644
--- a/src/finiteVolume/fields/volFields/volFieldsFwd.H
+++ b/src/finiteVolume/fields/volFields/volFieldsFwd.H
@@ -36,24 +36,13 @@ SourceFiles
#define Foam_volFieldsFwd_H
#include "fieldTypes.H"
+#include "GeometricFieldFwd.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
-// Geometric internal field
-template<class Type, class GeoMesh> class DimensionedField;
-
-// Geometric boundary field
-template<class Type, template<class> class PatchField, class GeoMesh>
-class GeometricBoundaryField;
-
-// Geometric field (internal + boundary)
-template<class Type, template<class> class PatchField, class GeoMesh>
-class GeometricField;
-
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// Forward Declarations
@@ -76,12 +65,25 @@ using VolumeInternalField = DimensionedField<Type, volMesh>;
// Typedefs
-typedef GeometricField<scalar, fvPatchField, volMesh> volScalarField;
-typedef GeometricField<vector, fvPatchField, volMesh> volVectorField;
-typedef GeometricField<sphericalTensor, fvPatchField, volMesh>
+typedef
+ GeometricField<scalar, fvPatchField, volMesh>
+ volScalarField;
+
+typedef
+ GeometricField<vector, fvPatchField, volMesh>
+ volVectorField;
+
+typedef
+ GeometricField<sphericalTensor, fvPatchField, volMesh>
volSphericalTensorField;
-typedef GeometricField<symmTensor, fvPatchField, volMesh> volSymmTensorField;
-typedef GeometricField<tensor, fvPatchField, volMesh> volTensorField;
+
+typedef
+ GeometricField<symmTensor, fvPatchField, volMesh>
+ volSymmTensorField;
+
+typedef
+ GeometricField<tensor, fvPatchField, volMesh>
+ volTensorField;
/*---------------------------------------------------------------------------*\
diff --git a/src/meshTools/fields/volume/polyMeshFieldsFwd.H b/src/meshTools/fields/volume/polyMeshFieldsFwd.H
index 448e43e0c9bd05b32a8e8831bd497742fa1b9ac8..1438b531ad6936e80486c68c408f579427897ac9 100644
--- a/src/meshTools/fields/volume/polyMeshFieldsFwd.H
+++ b/src/meshTools/fields/volume/polyMeshFieldsFwd.H
@@ -42,12 +42,25 @@ template<class Type, class GeoMesh> class DimensionedField;
class polyGeoMesh;
-typedef DimensionedField<scalar, polyGeoMesh> polyMeshScalarField;
-typedef DimensionedField<vector, polyGeoMesh> polyMeshVectorField;
-typedef DimensionedField<sphericalTensor, polyGeoMesh>
+typedef
+ DimensionedField<scalar, polyGeoMesh>
+ polyMeshScalarField;
+
+typedef
+ DimensionedField<vector, polyGeoMesh>
+ polyMeshVectorField;
+
+typedef
+ DimensionedField<sphericalTensor, polyGeoMesh>
polyMeshSphericalTensorField;
-typedef DimensionedField<symmTensor, polyGeoMesh> polyMeshSymmTensorField;
-typedef DimensionedField<tensor, polyGeoMesh> polyMeshTensorField;
+
+typedef
+ DimensionedField<symmTensor, polyGeoMesh>
+ polyMeshSymmTensorField;
+
+typedef
+ DimensionedField<tensor, polyGeoMesh>
+ polyMeshTensorField;
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/optimisation/adjointOptimisation/adjoint/global/boundaryFieldsFwd.H b/src/optimisation/adjointOptimisation/adjoint/global/boundaryFieldsFwd.H
index 0b1feeb72fc7f1fbed94dcd454eb9cbd8ea58ad1..c2a4f36d407acd760f80fbc5f9c29fa7e7c88a80 100644
--- a/src/optimisation/adjointOptimisation/adjoint/global/boundaryFieldsFwd.H
+++ b/src/optimisation/adjointOptimisation/adjoint/global/boundaryFieldsFwd.H
@@ -36,8 +36,8 @@ SourceFiles
\*---------------------------------------------------------------------------*/
-#ifndef boundaryFieldsFwd_H
-#define boundaryFieldsFwd_H
+#ifndef Foam_boundaryFieldsFwd_H
+#define Foam_boundaryFieldsFwd_H
#include "fieldTypes.H"
#include "volFields.H"
diff --git a/src/surfMesh/polySurface/fields/polySurfaceFieldsFwd.H b/src/surfMesh/polySurface/fields/polySurfaceFieldsFwd.H
index 8bf25faa3ab3193ed0f63eb10155281a76b17f4d..6492e9cf98086e8524656d1863880a5e144d186a 100644
--- a/src/surfMesh/polySurface/fields/polySurfaceFieldsFwd.H
+++ b/src/surfMesh/polySurface/fields/polySurfaceFieldsFwd.H
@@ -49,22 +49,28 @@ using PolyFaceField = DimensionedField<Type, polySurfaceGeoMesh>;
// Typedefs
-typedef DimensionedField<label, polySurfaceGeoMesh>
+typedef
+ DimensionedField<label, polySurfaceGeoMesh>
polySurfaceLabelField;
-typedef Foam::DimensionedField<scalar, polySurfaceGeoMesh>
+typedef
+ DimensionedField<scalar, polySurfaceGeoMesh>
polySurfaceScalarField;
-typedef Foam::DimensionedField<vector, polySurfaceGeoMesh>
+typedef
+ DimensionedField<vector, polySurfaceGeoMesh>
polySurfaceVectorField;
-typedef Foam::DimensionedField<sphericalTensor, polySurfaceGeoMesh>
+typedef
+ DimensionedField<sphericalTensor, polySurfaceGeoMesh>
polySurfaceSphericalTensorField;
-typedef Foam::DimensionedField<symmTensor, polySurfaceGeoMesh>
+typedef
+ DimensionedField<symmTensor, polySurfaceGeoMesh>
polySurfaceSymmTensorField;
-typedef Foam::DimensionedField<tensor, polySurfaceGeoMesh>
+typedef
+ DimensionedField<tensor, polySurfaceGeoMesh>
polySurfaceTensorField;
@@ -79,22 +85,28 @@ using PolyPointField = DimensionedField<Type, polySurfacePointGeoMesh>;
// Typedefs
-typedef Foam::DimensionedField<label, polySurfacePointGeoMesh>
+typedef
+ DimensionedField<label, polySurfacePointGeoMesh>
polySurfacePointLabelField;
-typedef Foam::DimensionedField<scalar, polySurfacePointGeoMesh>
+typedef
+ DimensionedField<scalar, polySurfacePointGeoMesh>
polySurfacePointScalarField;
-typedef Foam::DimensionedField<vector, polySurfacePointGeoMesh>
+typedef
+ DimensionedField<vector, polySurfacePointGeoMesh>
polySurfacePointVectorField;
-typedef Foam::DimensionedField<sphericalTensor, polySurfacePointGeoMesh>
+typedef
+ DimensionedField<sphericalTensor, polySurfacePointGeoMesh>
polySurfacePointSphericalTensorField;
-typedef Foam::DimensionedField<symmTensor, polySurfacePointGeoMesh>
+typedef
+ DimensionedField<symmTensor, polySurfacePointGeoMesh>
polySurfacePointSymmTensorField;
-typedef Foam::DimensionedField<tensor, polySurfacePointGeoMesh>
+typedef
+ DimensionedField<tensor, polySurfacePointGeoMesh>
polySurfacePointTensorField;
diff --git a/src/surfMesh/surfMesh/fields/surfFieldsFwd.H b/src/surfMesh/surfMesh/fields/surfFieldsFwd.H
index 6d0da8f573a8b2b806a8f4eb0c3e28a07a4454ee..dccb1d346bf9a9344059b25d4b10d3c29e91858f 100644
--- a/src/surfMesh/surfMesh/fields/surfFieldsFwd.H
+++ b/src/surfMesh/surfMesh/fields/surfFieldsFwd.H
@@ -45,22 +45,28 @@ template<class Type, class GeoMesh> class DimensionedField;
class surfGeoMesh;
// Typedefs
-typedef DimensionedField<label, surfGeoMesh>
+typedef
+ DimensionedField<label, surfGeoMesh>
surfLabelField;
-typedef DimensionedField<scalar, surfGeoMesh>
+typedef
+ DimensionedField<scalar, surfGeoMesh>
surfScalarField;
-typedef DimensionedField<vector, surfGeoMesh>
+typedef
+ DimensionedField<vector, surfGeoMesh>
surfVectorField;
-typedef DimensionedField<sphericalTensor, surfGeoMesh>
+typedef
+ DimensionedField<sphericalTensor, surfGeoMesh>
surfSphericalTensorField;
-typedef DimensionedField<symmTensor, surfGeoMesh>
+typedef
+ DimensionedField<symmTensor, surfGeoMesh>
surfSymmTensorField;
-typedef DimensionedField<tensor, surfGeoMesh>
+typedef
+ DimensionedField<tensor, surfGeoMesh>
surfTensorField;
@@ -70,22 +76,28 @@ typedef DimensionedField<tensor, surfGeoMesh>
class surfPointGeoMesh;
// Typedefs
-typedef DimensionedField<label, surfPointGeoMesh>
+typedef
+ DimensionedField<label, surfPointGeoMesh>
surfPointLabelField;
-typedef DimensionedField<scalar, surfPointGeoMesh>
+typedef
+ DimensionedField<scalar, surfPointGeoMesh>
surfPointScalarField;
-typedef DimensionedField<vector, surfPointGeoMesh>
+typedef
+ DimensionedField<vector, surfPointGeoMesh>
surfPointVectorField;
-typedef DimensionedField<sphericalTensor, surfPointGeoMesh>
+typedef
+ DimensionedField<sphericalTensor, surfPointGeoMesh>
surfPointSphericalTensorField;
-typedef DimensionedField<symmTensor, surfPointGeoMesh>
+typedef
+ DimensionedField<symmTensor, surfPointGeoMesh>
surfPointSymmTensorField;
-typedef DimensionedField<tensor, surfPointGeoMesh>
+typedef
+ DimensionedField<tensor, surfPointGeoMesh>
surfPointTensorField;
diff --git a/src/surfMesh/triSurface/fields/triSurfaceFieldsFwd.H b/src/surfMesh/triSurface/fields/triSurfaceFieldsFwd.H
index 8cc9387ab20df3e540f9390a2a324fc079120bd5..b4bf8fee0194bc264b8003ca6541830d8c59cb67 100644
--- a/src/surfMesh/triSurface/fields/triSurfaceFieldsFwd.H
+++ b/src/surfMesh/triSurface/fields/triSurfaceFieldsFwd.H
@@ -45,22 +45,28 @@ template<class Type, class GeoMesh> class DimensionedField;
class triSurfaceGeoMesh;
// Typedefs
-typedef Foam::DimensionedField<label, triSurfaceGeoMesh>
+typedef
+ DimensionedField<label, triSurfaceGeoMesh>
triSurfaceLabelField;
-typedef Foam::DimensionedField<scalar, triSurfaceGeoMesh>
+typedef
+ DimensionedField<scalar, triSurfaceGeoMesh>
triSurfaceScalarField;
-typedef Foam::DimensionedField<vector, triSurfaceGeoMesh>
+typedef
+ DimensionedField<vector, triSurfaceGeoMesh>
triSurfaceVectorField;
-typedef Foam::DimensionedField<sphericalTensor, triSurfaceGeoMesh>
+typedef
+ DimensionedField<sphericalTensor, triSurfaceGeoMesh>
triSurfaceSphericalTensorField;
-typedef Foam::DimensionedField<symmTensor, triSurfaceGeoMesh>
+typedef
+ DimensionedField<symmTensor, triSurfaceGeoMesh>
triSurfaceSymmTensorField;
-typedef Foam::DimensionedField<tensor, triSurfaceGeoMesh>
+typedef
+ DimensionedField<tensor, triSurfaceGeoMesh>
triSurfaceTensorField;
@@ -69,22 +75,28 @@ typedef Foam::DimensionedField<tensor, triSurfaceGeoMesh>
class triSurfacePointGeoMesh;
-typedef Foam::DimensionedField<label, triSurfacePointGeoMesh>
+typedef
+ DimensionedField<label, triSurfacePointGeoMesh>
triSurfacePointLabelField;
-typedef Foam::DimensionedField<scalar, triSurfacePointGeoMesh>
+typedef
+ DimensionedField<scalar, triSurfacePointGeoMesh>
triSurfacePointScalarField;
-typedef Foam::DimensionedField<vector, triSurfacePointGeoMesh>
+typedef
+ DimensionedField<vector, triSurfacePointGeoMesh>
triSurfacePointVectorField;
-typedef Foam::DimensionedField<sphericalTensor, triSurfacePointGeoMesh>
+typedef
+ DimensionedField<sphericalTensor, triSurfacePointGeoMesh>
triSurfacePointSphericalTensorField;
-typedef Foam::DimensionedField<symmTensor, triSurfacePointGeoMesh>
+typedef
+ DimensionedField<symmTensor, triSurfacePointGeoMesh>
triSurfacePointSymmTensorField;
-typedef Foam::DimensionedField<tensor, triSurfacePointGeoMesh>
+typedef
+ DimensionedField<tensor, triSurfacePointGeoMesh>
triSurfacePointTensorField;