ENH: type aliases for common GeometricField forms (#2348)

ENH: provide fieldTypes::surface names (as per fieldTypes::volume)

ENH: reduce number of files for surface fields

- combine face and point field declarations/definitions,
  simplify typeName definitions

src/sampling/sampledSurface/sampledSurface/sampledSurface.C

@@ -38,16 +38,6 @@ namespace Foam
 }
 
 
-const Foam::wordList Foam::sampledSurface::surfaceFieldTypes
-({
-    "surfaceScalarField",
-    "surfaceVectorField",
-    "surfaceSphericalTensorField",
-    "surfaceSymmTensorField",
-    "surfaceTensorField"
-});
-
-
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 void Foam::sampledSurface::clearGeom() const

src/sampling/sampledSurface/sampledSurface/sampledSurface.H

@@ -98,16 +98,6 @@ class sampledSurface
 :
     public meshedSurf
 {
-public:
-
-    // Public Static Data
-
-        //- Class names for surface field types
-        static const wordList surfaceFieldTypes;
-
-
-private:
-
     // Private Data
 
         //- The name of the sample surface

src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C

@@ -31,6 +31,7 @@ License
 
 #include "mapPolyMesh.H"
 #include "volFields.H"
+#include "surfaceFields.H"
 #include "HashOps.H"
 #include "ListOps.H"
 #include "Time.H"
@@ -159,7 +160,7 @@ Foam::IOobjectList Foam::sampledSurfaces::preCheckFields()
         {
             nVolumeFields += n;
         }
-        else if (sampledSurface::surfaceFieldTypes.found(clsName))
+        else if (fieldTypes::surface.found(clsName))
         {
             nSurfaceFields += n;
         }

src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C

@@ -31,7 +31,6 @@ License
 #include "surfaceFields.H"
 #include "polySurface.H"
 #include "polySurfaceFields.H"
-#include "polySurfacePointFields.H"
 #include "surfMesh.H"
 #include "surfGeoMesh.H"