From 4c2c4bb43d80925d93eb87789754fc63ff61851e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 23 Mar 2022 19:33:47 +0000
Subject: [PATCH] fvMesh, pointMesh: Simplified field mapping using
 FOR_ALL_FIELD_TYPES macro

---
 src/OpenFOAM/meshes/pointMesh/pointMesh.C | 23 +++++--------
 src/finiteVolume/fvMesh/fvMesh.C          | 40 ++++++-----------------
 2 files changed, 18 insertions(+), 45 deletions(-)

diff --git a/src/OpenFOAM/meshes/pointMesh/pointMesh.C b/src/OpenFOAM/meshes/pointMesh/pointMesh.C
index 885e7d1448..523ab54bc8 100644
--- a/src/OpenFOAM/meshes/pointMesh/pointMesh.C
+++ b/src/OpenFOAM/meshes/pointMesh/pointMesh.C
@@ -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
@@ -48,21 +48,14 @@ void Foam::pointMesh::mapFields(const mapPolyMesh& map)
             << "Mapping all registered pointFields."
             << endl;
     }
-    // Create a mapper
-    const pointMeshMapper m(*this, map);
 
-    MapGeometricFields<scalar, pointPatchField, pointMeshMapper, pointMesh>(m);
-    MapGeometricFields<vector, pointPatchField, pointMeshMapper, pointMesh>(m);
-    MapGeometricFields
-    <
-        sphericalTensor,
-        pointPatchField,
-        pointMeshMapper,
-        pointMesh
-    >(m);
-    MapGeometricFields<symmTensor, pointPatchField, pointMeshMapper, pointMesh>
-    (m);
-    MapGeometricFields<tensor, pointPatchField, pointMeshMapper, pointMesh>(m);
+    // Create the pointMesh mapper
+    const pointMeshMapper mapper(*this, map);
+
+    #define mapPointFieldType(Type, nullArg)                                   \
+        MapGeometricFields<Type, pointPatchField, pointMeshMapper, pointMesh>  \
+        (mapper);
+    FOR_ALL_FIELD_TYPES(mapPointFieldType);
 }
 
 
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index 2d46e731a5..3c5475c614 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -688,40 +688,20 @@ void Foam::fvMesh::mapFields(const mapPolyMesh& meshMap)
     const fvMeshMapper mapper(*this, meshMap);
 
     // Map all the volFields in the objectRegistry
-    MapGeometricFields<scalar, fvPatchField, fvMeshMapper, volMesh>
-    (mapper);
-    MapGeometricFields<vector, fvPatchField, fvMeshMapper, volMesh>
-    (mapper);
-    MapGeometricFields<sphericalTensor, fvPatchField, fvMeshMapper, volMesh>
-    (mapper);
-    MapGeometricFields<symmTensor, fvPatchField, fvMeshMapper, volMesh>
-    (mapper);
-    MapGeometricFields<tensor, fvPatchField, fvMeshMapper, volMesh>
-    (mapper);
+    #define mapVolFieldType(Type, nullArg)                                     \
+        MapGeometricFields<Type, fvPatchField, fvMeshMapper, volMesh>(mapper);
+    FOR_ALL_FIELD_TYPES(mapVolFieldType);
 
     // Map all the surfaceFields in the objectRegistry
-    MapGeometricFields<scalar, fvsPatchField, fvMeshMapper, surfaceMesh>
-    (mapper);
-    MapGeometricFields<vector, fvsPatchField, fvMeshMapper, surfaceMesh>
-    (mapper);
-    MapGeometricFields
-    <
-        sphericalTensor,
-        fvsPatchField,
-        fvMeshMapper,
-        surfaceMesh
-    >(mapper);
-    MapGeometricFields<symmTensor, fvsPatchField, fvMeshMapper, surfaceMesh>
-    (mapper);
-    MapGeometricFields<tensor, fvsPatchField, fvMeshMapper, surfaceMesh>
-    (mapper);
+    #define mapSurfaceFieldType(Type, nullArg)                                 \
+        MapGeometricFields<Type, fvsPatchField, fvMeshMapper, surfaceMesh>     \
+        (mapper);
+    FOR_ALL_FIELD_TYPES(mapSurfaceFieldType);
 
     // Map all the dimensionedFields in the objectRegistry
-    MapDimensionedFields<scalar, fvMeshMapper, volMesh>(mapper);
-    MapDimensionedFields<vector, fvMeshMapper, volMesh>(mapper);
-    MapDimensionedFields<sphericalTensor, fvMeshMapper, volMesh>(mapper);
-    MapDimensionedFields<symmTensor, fvMeshMapper, volMesh>(mapper);
-    MapDimensionedFields<tensor, fvMeshMapper, volMesh>(mapper);
+    #define mapVolInternalFieldType(Type, nullArg)                             \
+        MapDimensionedFields<Type, fvMeshMapper, volMesh>(mapper);
+    FOR_ALL_FIELD_TYPES(mapVolInternalFieldType);
 
     // Map all the clouds in the objectRegistry
     mapClouds(*this, meshMap);