diff --git a/applications/solvers/multiphase/bubbleFoam/createPhia.H b/applications/solvers/multiphase/bubbleFoam/createPhia.H
index 74d4678872..703587bfd5 100644
--- a/applications/solvers/multiphase/bubbleFoam/createPhia.H
+++ b/applications/solvers/multiphase/bubbleFoam/createPhia.H
@@ -38,7 +38,7 @@
 
         for (label i=0; i<Ua.boundaryField().size(); i++)
         {
-            if (isType<fixedValueFvPatchVectorField>(Ua.boundaryField()[i]))
+            if (isA<fixedValueFvPatchVectorField>(Ua.boundaryField()[i]))
             {
                 phiTypes[i] = fixedValueFvPatchScalarField::typeName;
             }
diff --git a/applications/solvers/multiphase/bubbleFoam/createPhib.H b/applications/solvers/multiphase/bubbleFoam/createPhib.H
index b1807e48ad..77bb467063 100644
--- a/applications/solvers/multiphase/bubbleFoam/createPhib.H
+++ b/applications/solvers/multiphase/bubbleFoam/createPhib.H
@@ -38,7 +38,7 @@
 
         for (label i=0; i<Ub.boundaryField().size(); i++)
         {
-            if (isType<fixedValueFvPatchVectorField>(Ub.boundaryField()[i]))
+            if (isA<fixedValueFvPatchVectorField>(Ub.boundaryField()[i]))
             {
                 phiTypes[i] = fixedValueFvPatchScalarField::typeName;
             }
diff --git a/applications/solvers/multiphase/bubbleFoam/wallDissipation.H b/applications/solvers/multiphase/bubbleFoam/wallDissipation.H
index 5c84c9e7ac..b374f64cec 100644
--- a/applications/solvers/multiphase/bubbleFoam/wallDissipation.H
+++ b/applications/solvers/multiphase/bubbleFoam/wallDissipation.H
@@ -37,7 +37,7 @@ Description
     {
         const fvPatch& p = patches[patchi];
 
-        if (isType<wallFvPatch>(p))
+        if (isA<wallFvPatch>(p))
         {
             epsEqn.setValues
             (
diff --git a/applications/solvers/multiphase/bubbleFoam/wallFunctions.H b/applications/solvers/multiphase/bubbleFoam/wallFunctions.H
index 38b7297b10..fe5d16909e 100644
--- a/applications/solvers/multiphase/bubbleFoam/wallFunctions.H
+++ b/applications/solvers/multiphase/bubbleFoam/wallFunctions.H
@@ -12,7 +12,7 @@
     {
         const fvPatch& currPatch = patches[patchi];
 
-        if (isType<wallFvPatch>(currPatch))
+        if (isA<wallFvPatch>(currPatch))
         {
             forAll(currPatch, facei)
             {
@@ -30,7 +30,7 @@
     {
         const fvPatch& currPatch = patches[patchi];
 
-        if (isType<wallFvPatch>(currPatch))
+        if (isA<wallFvPatch>(currPatch))
         {
             const scalarField& nuw = nutb.boundaryField()[patchi];
 
@@ -74,7 +74,7 @@
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (isType<wallFvPatch>(curPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             forAll(curPatch, facei)
             {
diff --git a/applications/solvers/multiphase/bubbleFoam/wallViscosity.H b/applications/solvers/multiphase/bubbleFoam/wallViscosity.H
index 21ea94d8d7..aef31a3d16 100644
--- a/applications/solvers/multiphase/bubbleFoam/wallViscosity.H
+++ b/applications/solvers/multiphase/bubbleFoam/wallViscosity.H
@@ -10,7 +10,7 @@
     {
         const fvPatch& currPatch = patches[patchi];
 
-        if (isType<wallFvPatch>(currPatch))
+        if (isA<wallFvPatch>(currPatch))
         {
             scalarField& nutw = nutb.boundaryField()[patchi];
 
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
index 240207c8ab..2ebb83c2fc 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
@@ -352,7 +352,7 @@ void Foam::multiphaseMixture::correctContactAngle
 
     forAll(boundary, patchi)
     {
-        if (typeid(gbf[patchi]) == typeid(alphaContactAngleFvPatchScalarField))
+        if (isA<alphaContactAngleFvPatchScalarField>(gbf[patchi]))
         {
             const alphaContactAngleFvPatchScalarField& acap =
                 refCast<const alphaContactAngleFvPatchScalarField>(gbf[patchi]);
diff --git a/applications/solvers/multiphase/settlingFoam/wallDissipation.H b/applications/solvers/multiphase/settlingFoam/wallDissipation.H
index 5c84c9e7ac..b374f64cec 100644
--- a/applications/solvers/multiphase/settlingFoam/wallDissipation.H
+++ b/applications/solvers/multiphase/settlingFoam/wallDissipation.H
@@ -37,7 +37,7 @@ Description
     {
         const fvPatch& p = patches[patchi];
 
-        if (isType<wallFvPatch>(p))
+        if (isA<wallFvPatch>(p))
         {
             epsEqn.setValues
             (
diff --git a/applications/solvers/multiphase/settlingFoam/wallFunctions.H b/applications/solvers/multiphase/settlingFoam/wallFunctions.H
index ae323691e3..decccfbff5 100644
--- a/applications/solvers/multiphase/settlingFoam/wallFunctions.H
+++ b/applications/solvers/multiphase/settlingFoam/wallFunctions.H
@@ -12,7 +12,7 @@
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (isType<wallFvPatch>(curPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             forAll(curPatch, facei)
             {
@@ -30,7 +30,7 @@
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (isType<wallFvPatch>(curPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             const scalarField& rhow = rho.boundaryField()[patchi];
 
@@ -76,7 +76,7 @@
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (isType<wallFvPatch>(curPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             forAll(curPatch, facei)
             {
diff --git a/applications/solvers/multiphase/settlingFoam/wallViscosity.H b/applications/solvers/multiphase/settlingFoam/wallViscosity.H
index 35d6f9ba8b..8f64c27b3c 100644
--- a/applications/solvers/multiphase/settlingFoam/wallViscosity.H
+++ b/applications/solvers/multiphase/settlingFoam/wallViscosity.H
@@ -9,7 +9,7 @@
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (isType<wallFvPatch>(curPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             const scalarField& rhow = rho.boundaryField()[patchi];
 
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/phaseModel/phaseModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/phaseModel/phaseModel.C
index 5442ad17ba..aec2daf24a 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/phaseModel/phaseModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseModel/phaseModel/phaseModel.C
@@ -109,7 +109,7 @@ Foam::phaseModel::phaseModel
 
         for (label i=0; i<U_.boundaryField().size(); i++)
         {
-            if (isType<fixedValueFvPatchVectorField>(U_.boundaryField()[i]))
+            if (isA<fixedValueFvPatchVectorField>(U_.boundaryField()[i]))
             {
                 phiTypes[i] = fixedValueFvPatchScalarField::typeName;
             }
diff --git a/applications/test/nearWallDist-wave/testWallDist2.C b/applications/test/nearWallDist-wave/testWallDist2.C
index 8666e0905c..724702810c 100644
--- a/applications/test/nearWallDist-wave/testWallDist2.C
+++ b/applications/test/nearWallDist-wave/testWallDist2.C
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
     {
         const fvPatch& patch = mesh.boundary()[patchI];
 
-        if (typeid(patch) == typeid(wallFvPatch))
+        if (isA<wallFvPatch>(patch))
         {
             nWalls += patch.size();
         }
@@ -91,7 +91,7 @@ int main(int argc, char *argv[])
     {
         const fvPatch& patch = mesh.boundary()[patchI];
 
-        if (typeid(patch) == typeid(wallFvPatch))
+        if (isA<wallFvPatch>(patch))
         {
             forAll (patch.Cf(), patchFaceI)
             {
diff --git a/applications/test/nearWallDist-wave/testWallDistData.C b/applications/test/nearWallDist-wave/testWallDistData.C
index ab6f1d2e8d..cb742f435f 100644
--- a/applications/test/nearWallDist-wave/testWallDistData.C
+++ b/applications/test/nearWallDist-wave/testWallDistData.C
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
     {
         const fvPatch& patch = mesh.boundary()[patchI];
 
-        if (typeid(patch) == typeid(wallFvPatch))
+        if (isA<wallFvPatch>(patch))
         {
             fvPatchVectorField& wallData = n.boundaryField()[patchI];
 
diff --git a/applications/test/nearWallDist-wave/testYPlus.C b/applications/test/nearWallDist-wave/testYPlus.C
index fd718be643..d5a0020d44 100644
--- a/applications/test/nearWallDist-wave/testYPlus.C
+++ b/applications/test/nearWallDist-wave/testYPlus.C
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
     {
         const fvPatch& patch = mesh.boundary()[patchI];
 
-        if (typeid(patch) == typeid(wallFvPatch))
+        if (isA<wallFvPatch>(patch))
         {
             fvPatchScalarField& wallData = yStar.boundaryField()[patchI];
 
diff --git a/applications/test/router/processorRouter.C b/applications/test/router/processorRouter.C
index aac34dff23..e94025ff2b 100644
--- a/applications/test/router/processorRouter.C
+++ b/applications/test/router/processorRouter.C
@@ -55,7 +55,7 @@ labelList procNeighbours(const polyMesh& mesh)
 
     forAll (mesh.boundaryMesh(), patchI)
     {
-        if (typeid(mesh.boundaryMesh()[patchI]) == typeid(processorPolyPatch))
+        if (isA<processorPolyPatch>(mesh.boundaryMesh()[patchI]))
         {
             nNeighbours++;
         }
@@ -67,7 +67,7 @@ labelList procNeighbours(const polyMesh& mesh)
 
     forAll (mesh.boundaryMesh(), patchI)
     {
-        if (typeid(mesh.boundaryMesh()[patchI]) == typeid(processorPolyPatch))
+        if (isA<processorPolyPatch>(mesh.boundaryMesh()[patchI]))
         {
             const polyPatch& patch = mesh.boundaryMesh()[patchI];
 
diff --git a/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C b/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C
index 5ead5e5584..65ee7d1b49 100644
--- a/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C
+++ b/applications/utilities/mesh/conversion/foamMeshToFluent/fluentFvMesh.C
@@ -174,17 +174,11 @@ void Foam::fluentFvMesh::writeFluentMesh() const
         nWrittenFaces += patchFaces.size();
 
         // Write patch type
-        if
-        (
-            typeid(boundary()[patchI]) == typeid(wallFvPatch)
-        )
+        if (isA<wallFvPatch>(boundary()[patchI]))
         {
             fluentMeshFile << 3;
         }
-        else if
-        (
-            typeid(boundary()[patchI]) == typeid(symmetryFvPatch)
-        )
+        else if (isA<symmetryFvPatch>(boundary()[patchI]))
         {
             fluentMeshFile << 7;
         }
@@ -282,17 +276,11 @@ void Foam::fluentFvMesh::writeFluentMesh() const
             << "(39 (" << patchI + 10 << " ";
 
         // Write patch type
-        if
-        (
-            typeid(boundary()[patchI]) == typeid(wallFvPatch)
-        )
+        if (isA<wallFvPatch>(boundary()[patchI]))
         {
             fluentMeshFile << "wall ";
         }
-        else if
-        (
-            typeid(boundary()[patchI]) == typeid(symmetryFvPatch)
-        )
+        else if (isA<symmetryFvPatch>(boundary()[patchI]))
         {
             fluentMeshFile << "symmetry ";
         }
diff --git a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
index e7beaf0082..bbe5775b51 100644
--- a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
+++ b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C
@@ -268,10 +268,7 @@ label twoDNess(const polyMesh& mesh)
     {
         const polyPatch& patch = patches[patchI];
 
-        if
-        (
-            typeid(patch) != typeid(wedgePolyPatch)
-        )
+        if (!isA<wedgePolyPatch>(patch))
         {
             const vectorField& n = patch.faceAreas();
 
diff --git a/applications/utilities/mesh/manipulation/setSet/setSet.C b/applications/utilities/mesh/manipulation/setSet/setSet.C
index 5290750d4c..a1d7a38912 100644
--- a/applications/utilities/mesh/manipulation/setSet/setSet.C
+++ b/applications/utilities/mesh/manipulation/setSet/setSet.C
@@ -121,7 +121,7 @@ void writeVTK
     const fileName& vtkName
 )
 {
-    if (typeid(currentSet) == typeid(faceSet))
+    if (isA<faceSet>(currentSet))
     {
         // Faces of set with OpenFOAM faceID as value
 
@@ -148,7 +148,7 @@ void writeVTK
             mesh.time().path()/vtkName
         );
     }
-    else if (typeid(currentSet) == typeid(cellSet))
+    else if (isA<cellSet>(currentSet))
     {
         // External faces of cellset with OpenFOAM cellID as value
 
@@ -208,7 +208,7 @@ void writeVTK
             mesh.time().path()/vtkName
         );
     }
-    else if (typeid(currentSet) == typeid(pointSet))
+    else if (isA<pointSet>(currentSet))
     {
         writePointSet
         (
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index dfc657fe8f..e709163218 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -160,12 +160,8 @@ void reorderPatchFields(fvMesh& mesh, const labelList& oldToNew)
 
 
 // Adds patch if not yet there. Returns patchID.
-label addPatch
-(
-    fvMesh& mesh,
-    const word& patchName,
-    const word& patchType
-)
+template<class PatchType>
+label addPatch(fvMesh& mesh, const word& patchName)
 {
     polyBoundaryMesh& polyPatches =
         const_cast<polyBoundaryMesh&>(mesh.boundaryMesh());
@@ -173,11 +169,18 @@ label addPatch
     label patchI = polyPatches.findPatchID(patchName);
     if (patchI != -1)
     {
-        if (polyPatches[patchI].type() == patchType)
+        if (isA<PatchType>(polyPatches[patchI]))
         {
             // Already there
             return patchI;
         }
+        else
+        {
+            FatalErrorIn("addPatch<PatchType>(fvMesh&, const word&)")
+                << "Already have patch " << patchName
+                << " but of type " << PatchType::typeName
+                << exit(FatalError);
+        }
     }
 
 
@@ -214,7 +217,7 @@ label addPatch
         sz,
         polyPatch::New
         (
-            patchType,
+            PatchType::typeName,
             patchName,
             0,              // size
             startFaceI,
@@ -1021,17 +1024,15 @@ EdgeMap<label> addRegionPatches
 
         if (interfaceSizes[e] > 0)
         {
-            label patchI = addPatch
+            label patchI = addPatch<directMappedWallPolyPatch>
             (
                 mesh,
-                regionNames[e[0]] + "_to_" + regionNames[e[1]],
-                directMappedWallPolyPatch::typeName
+                regionNames[e[0]] + "_to_" + regionNames[e[1]]
             );
-            addPatch
+            addPatch<directMappedWallPolyPatch>
             (
                 mesh,
-                regionNames[e[1]] + "_to_" + regionNames[e[0]],
-                directMappedWallPolyPatch::typeName
+                regionNames[e[1]] + "_to_" + regionNames[e[0]]
             );
 
             Info<< "For interface between region " << e[0]
@@ -1405,7 +1406,7 @@ int main(int argc, char *argv[])
             IOobject
             (
                 "cellToRegion",
-                mesh.facesInstance(),
+                runTime.timeName(),
                 mesh,
                 IOobject::NO_READ,
                 IOobject::NO_WRITE,
diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposeMesh.C b/applications/utilities/parallelProcessing/decomposePar/decomposeMesh.C
index a3df89e3d7..2e29b243aa 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposeMesh.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposeMesh.C
@@ -243,7 +243,7 @@ void domainDecomposition::decomposeMesh(const bool filterEmptyPatches)
 
             const label patchStart = patches[patchi].start();
 
-            if (typeid(patches[patchi]) != typeid(cyclicPolyPatch))
+            if (!isA<cyclicPolyPatch>(patches[patchi]))
             {
                 // Normal patch. Add faces to processor where the cell
                 // next to the face lives
diff --git a/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructorReconstructFields.C b/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructorReconstructFields.C
index 2a9eea10d6..1f9ec1782a 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructorReconstructFields.C
+++ b/applications/utilities/parallelProcessing/reconstructPar/fvFieldReconstructorReconstructFields.C
@@ -191,7 +191,7 @@ Foam::fvFieldReconstructor::reconstructFvVolumeField
         // add empty patches
         if
         (
-            typeid(mesh_.boundary()[patchI]) == typeid(emptyFvPatch)
+            isType<emptyFvPatch>(mesh_.boundary()[patchI])
          && !patchFields(patchI)
         )
         {
@@ -411,7 +411,7 @@ Foam::fvFieldReconstructor::reconstructFvSurfaceField
         // add empty patches
         if
         (
-            typeid(mesh_.boundary()[patchI]) == typeid(emptyFvPatch)
+            isType<emptyFvPatch>(mesh_.boundary()[patchI])
          && !patchFields(patchI)
         )
         {
diff --git a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/fieldviewTopology.C b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/fieldviewTopology.C
index 99236da213..473ab6f7af 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/fieldviewTopology.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/fieldviewTopology.C
@@ -127,8 +127,8 @@ Foam::fieldviewTopology::fieldviewTopology
             const polyPatch& currPatch = mesh.boundaryMesh()[patchI];
             if 
             (
-                isType<wallPolyPatch>(currPatch)
-             || isType<symmetryPolyPatch>(currPatch)
+                isA<wallPolyPatch>(currPatch)
+             || isA<symmetryPolyPatch>(currPatch)
             )
             {
                 forAll(currPatch, patchFaceI)
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index 33d3fc5742..0a854af9d0 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -205,8 +205,8 @@ labelList getSelectedPatches
 
         if
         (
-            isType<emptyPolyPatch>(pp)
-            || (Pstream::parRun() && isType<processorPolyPatch>(pp))
+            isA<emptyPolyPatch>(pp)
+            || (Pstream::parRun() && isA<processorPolyPatch>(pp))
         )
         {
             Info<< "    discarding empty/processor patch " << patchI
@@ -805,7 +805,7 @@ int main(int argc, char *argv[])
                         labelList(1, patchI)
                     );
 
-                    if (!isType<emptyPolyPatch>(pp))
+                    if (!isA<emptyPolyPatch>(pp))
                     {
                         // VolFields + patchID
                         writeFuns::writeCellDataHeader
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.C
index 546e0fb7aa..b012e4baf6 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/patchWriter.C
@@ -152,7 +152,7 @@ void Foam::patchWriter::writePatchIDs()
 
         const polyPatch& pp = mesh.boundaryMesh()[patchI];
 
-        if (!isType<emptyPolyPatch>(pp))
+        if (!isA<emptyPolyPatch>(pp))
         {
             writeFuns::insert(scalarField(pp.size(), patchI), fField);
         }
diff --git a/applications/utilities/postProcessing/graphics/fieldview9Reader/fieldview9Reader.C b/applications/utilities/postProcessing/graphics/fieldview9Reader/fieldview9Reader.C
index 02853197f9..17f1dfcb2e 100644
--- a/applications/utilities/postProcessing/graphics/fieldview9Reader/fieldview9Reader.C
+++ b/applications/utilities/postProcessing/graphics/fieldview9Reader/fieldview9Reader.C
@@ -609,7 +609,7 @@ void user_query_file_function
 
         strcpy(face_type_names[patchI], patch.name().c_str());
 
-        if (isType<wallPolyPatch>(patch))
+        if (isA<wallPolyPatch>(patch))
         {
             wall_flags[patchI] = 1;
         }
diff --git a/applications/utilities/postProcessing/patch/patchIntegrate/patchIntegrate.C b/applications/utilities/postProcessing/patch/patchIntegrate/patchIntegrate.C
index 54acae0025..054c09cac5 100644
--- a/applications/utilities/postProcessing/patch/patchIntegrate/patchIntegrate.C
+++ b/applications/utilities/postProcessing/patch/patchIntegrate/patchIntegrate.C
@@ -76,7 +76,7 @@ int main(int argc, char *argv[])
             }
 
             // Give patch area
-            if (isType<cyclicPolyPatch>(mesh.boundaryMesh()[patchi]))
+            if (isA<cyclicPolyPatch>(mesh.boundaryMesh()[patchi]))
             {
                 Info<< "    Cyclic patch vector area: " << nl;
                 label nFaces = mesh.boundaryMesh()[patchi].size();
diff --git a/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C b/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C
index c83fcb983a..74a906fd46 100644
--- a/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C
+++ b/applications/utilities/postProcessing/wall/wallHeatFlux/wallHeatFlux.C
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
         Info<< "\nWall heat fluxes [W]" << endl;
         forAll(patchHeatFlux, patchi)
         {
-            if (typeid(mesh.boundary()[patchi]) == typeid(wallFvPatch))
+            if (isA<wallFvPatch>(mesh.boundary()[patchi]))
             {
                 Info<< mesh.boundary()[patchi].name()
                     << " "
diff --git a/applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C b/applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C
index 67dc0df3f0..785330a0dd 100644
--- a/applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C
+++ b/applications/utilities/postProcessing/wall/yPlusLES/yPlusLES.C
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
         {
             const fvPatch& currPatch = patches[patchi];
 
-            if (typeid(currPatch) == typeid(wallFvPatch))
+            if (isA<wallFvPatch>(currPatch))
             {
                 yPlus.boundaryField()[patchi] =
                     d[patchi]
diff --git a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C b/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C
index d9164987ff..b2f53d5e0d 100644
--- a/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C
+++ b/applications/utilities/preProcessing/applyWallFunctionBoundaryConditions/applyWallFunctionBoundaryConditions.C
@@ -202,7 +202,7 @@ void replaceBoundaryType
     dictionary& boundaryDict = dict.subDict("boundaryField");
     forAll(bMesh, patchI)
     {
-        if (isType<wallPolyPatch>(bMesh[patchI]))
+        if (isA<wallPolyPatch>(bMesh[patchI]))
         {
             word patchName = bMesh[patchI].name();
             dictionary& oldPatch = boundaryDict.subDict(patchName);
diff --git a/applications/utilities/preProcessing/mapFields/mapFields.C b/applications/utilities/preProcessing/mapFields/mapFields.C
index 111c871958..ccaf04d4a5 100644
--- a/applications/utilities/preProcessing/mapFields/mapFields.C
+++ b/applications/utilities/preProcessing/mapFields/mapFields.C
@@ -164,7 +164,7 @@ void mapConsistentSubMesh
 
     forAll(meshTarget.boundary(), patchi)
     {
-        if (typeid(meshTarget.boundary()[patchi]) != typeid(processorFvPatch))
+        if (!isA<processorFvPatch>(meshTarget.boundary()[patchi]))
         {
             patchMap.insert
             (
@@ -201,7 +201,7 @@ wordList addProcessorPatches
 
     forAll (meshTarget.boundary(), patchi)
     {
-        if (typeid(meshTarget.boundary()[patchi]) == typeid(processorFvPatch))
+        if (isA<processorFvPatch>(meshTarget.boundary()[patchi]))
         {
             if
             (
diff --git a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
index 53f726ac5c..fb7d427463 100644
--- a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
+++ b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
@@ -108,11 +108,7 @@ int main(int argc, char *argv[])
         {
             const polyPatch& patch = bMesh[patchI];
 
-            if
-            (
-                includeProcPatches
-             || (patch.type() != processorPolyPatch::typeName)
-            )
+            if (includeProcPatches || !isA<processorPolyPatch>(patch))
             {
                 includePatches.insert(patchI);
             }
diff --git a/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.C b/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.C
index 724623b7fd..5159644fbf 100644
--- a/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.C
+++ b/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.C
@@ -282,13 +282,13 @@ void Foam::FaceCellWave<Type>::checkCyclic(const polyPatch& patch) const
 }
 
 
-// Check if patches of given type name are present
+// Check if has cyclic patches
 template <class Type>
-bool Foam::FaceCellWave<Type>::hasPatchType(const word& nameOfType)
+bool Foam::FaceCellWave<Type>::hasCyclicPatch() const
 {
     forAll(mesh_.boundaryMesh(), patchI)
     {
-        if (mesh_.boundaryMesh()[patchI].type() == nameOfType)
+        if (isA<cyclicPolyPatch>(mesh_.boundaryMesh()[patchI]))
         {
             return true;
         }
@@ -811,7 +811,7 @@ Foam::FaceCellWave<Type>::FaceCellWave
     changedCell_(mesh_.nCells(), false),
     changedCells_(mesh_.nCells()),
     nChangedCells_(0),
-    hasCyclicPatches_(hasPatchType(cyclicPolyPatch::typeName)),
+    hasCyclicPatches_(hasCyclicPatch()),
     nEvals_(0),
     nUnvisitedCells_(mesh_.nCells()),
     nUnvisitedFaces_(mesh_.nFaces()),
@@ -841,7 +841,7 @@ Foam::FaceCellWave<Type>::FaceCellWave
     changedCell_(mesh_.nCells(), false),
     changedCells_(mesh_.nCells()),
     nChangedCells_(0),
-    hasCyclicPatches_(hasPatchType(cyclicPolyPatch::typeName)),
+    hasCyclicPatches_(hasCyclicPatch()),
     nEvals_(0),
     nUnvisitedCells_(mesh_.nCells()),
     nUnvisitedFaces_(mesh_.nFaces()),
diff --git a/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.H b/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.H
index fa4ee657ea..4607ba1322 100644
--- a/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.H
+++ b/src/OpenFOAM/algorithms/MeshWave/FaceCellWave.H
@@ -184,8 +184,8 @@ class FaceCellWave
             //- Debugging: check info on both sides of cyclic
             void checkCyclic(const polyPatch& pPatch) const;
 
-            //- Has patches of certain type?
-            bool hasPatchType(const word& nameOfType);
+            //- Has cyclic patch?
+            bool hasCyclicPatch() const;
 
             //- Merge received patch data into global data
             void mergeFaceInfo
diff --git a/src/OpenFOAM/meshes/ProcessorTopology/ProcessorTopology.C b/src/OpenFOAM/meshes/ProcessorTopology/ProcessorTopology.C
index 191cb37ebd..673d62459b 100644
--- a/src/OpenFOAM/meshes/ProcessorTopology/ProcessorTopology.C
+++ b/src/OpenFOAM/meshes/ProcessorTopology/ProcessorTopology.C
@@ -47,7 +47,7 @@ Foam::labelList Foam::ProcessorTopology<Patch, ProcPatch>::procNeighbours
     {
         const Patch& patch = patches[patchi];
 
-        if (isType<ProcPatch>(patch))
+        if (isA<ProcPatch>(patch))
         {
             const ProcPatch& procPatch = 
                 refCast<const ProcPatch>(patch);
@@ -69,7 +69,7 @@ Foam::labelList Foam::ProcessorTopology<Patch, ProcPatch>::procNeighbours
     {
         const Patch& patch = patches[patchi];
 
-        if (isType<ProcPatch>(patch))
+        if (isA<ProcPatch>(patch))
         {
             const ProcPatch& procPatch = 
                 refCast<const ProcPatch>(patch);
@@ -116,7 +116,7 @@ Foam::ProcessorTopology<Patch, ProcPatch>::ProcessorTopology
 
         forAll(patches, patchi)
         {
-            if (!isType<ProcPatch>(patches[patchi]))
+            if (!isA<ProcPatch>(patches[patchi]))
             {
                 patchSchedule_[patchEvali].patch = patchi;
                 patchSchedule_[patchEvali++].init = true;
@@ -204,7 +204,7 @@ Foam::ProcessorTopology<Patch, ProcPatch>::ProcessorTopology
 
         forAll(patches, patchi)
         {
-            if (!isType<ProcPatch>(patches[patchi]))
+            if (!isA<ProcPatch>(patches[patchi]))
             {
                 patchSchedule_[patchEvali].patch = patchi;
                 patchSchedule_[patchEvali++].init = true;
@@ -219,7 +219,7 @@ Foam::ProcessorTopology<Patch, ProcPatch>::ProcessorTopology
         // 2a. initEvaluate
         forAll(patches, patchi)
         {
-            if (isType<ProcPatch>(patches[patchi]))
+            if (isA<ProcPatch>(patches[patchi]))
             {
                 patchSchedule_[patchEvali].patch = patchi;
                 patchSchedule_[patchEvali++].init = true;
@@ -229,7 +229,7 @@ Foam::ProcessorTopology<Patch, ProcPatch>::ProcessorTopology
         // 2b. evaluate
         forAll(patches, patchi)
         {
-            if (isType<ProcPatch>(patches[patchi]))
+            if (isA<ProcPatch>(patches[patchi]))
             {
                 patchSchedule_[patchEvali].patch = patchi;
                 patchSchedule_[patchEvali++].init = false;
diff --git a/src/conversion/ensight/part/ensightParts.C b/src/conversion/ensight/part/ensightParts.C
index 9ed79e75a8..36ee068312 100644
--- a/src/conversion/ensight/part/ensightParts.C
+++ b/src/conversion/ensight/part/ensightParts.C
@@ -158,11 +158,7 @@ void Foam::ensightParts::recalculate(const polyMesh& pMesh)
     forAll(pMesh.boundaryMesh(), patchI)
     {
         const polyPatch& pPatch = pMesh.boundaryMesh()[patchI];
-        if
-        (
-            pPatch.size()
-         && typeid(pPatch) != typeid(processorPolyPatch)
-        )
+        if (pPatch.size() && !isA<processorPolyPatch>(pPatch))
         {
             partsList_.set
             (
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index f815b46d71..fea10f410b 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -31,6 +31,7 @@ License
 #include "fvMeshAdder.H"
 #include "faceCoupleInfo.H"
 #include "processorFvPatchField.H"
+#include "processorFvsPatchField.H"
 #include "polyTopoChange.H"
 #include "removeCells.H"
 #include "polyModifyFace.H"
@@ -2124,54 +2125,56 @@ Foam::autoPtr<Foam::mapDistributePolyMesh> Foam::fvMeshDistribute::distribute
 
     // Bit of hack: processorFvPatchField does not get reset since created
     // from nothing so explicitly reset.
-    initPatchFields<volScalarField>
+    initPatchFields<volScalarField, processorFvPatchField<scalar> >
     (
-        processorFvPatchField<scalar>::typeName,
         pTraits<scalar>::zero
     );
-    initPatchFields<volVectorField>
+    initPatchFields<volVectorField, processorFvPatchField<vector> >
     (
-        processorFvPatchField<vector>::typeName,
         pTraits<vector>::zero
     );
-    initPatchFields<volSphericalTensorField>
+    initPatchFields
+    <
+        volSphericalTensorField,
+        processorFvPatchField<sphericalTensor>
+    >
     (
-        processorFvPatchField<sphericalTensor>::typeName,
         pTraits<sphericalTensor>::zero
     );
-    initPatchFields<volSymmTensorField>
+    initPatchFields<volSymmTensorField, processorFvPatchField<symmTensor> >
     (
-        processorFvPatchField<symmTensor>::typeName,
         pTraits<symmTensor>::zero
     );
-    initPatchFields<volTensorField>
+    initPatchFields<volTensorField, processorFvPatchField<tensor> >
     (
-        processorFvPatchField<tensor>::typeName,
         pTraits<tensor>::zero
     );
-    initPatchFields<surfaceScalarField>
+    initPatchFields<surfaceScalarField, processorFvsPatchField<scalar> >
     (
-        processorFvPatchField<scalar>::typeName,
         pTraits<scalar>::zero
     );
-    initPatchFields<surfaceVectorField>
+    initPatchFields<surfaceVectorField, processorFvsPatchField<vector> >
     (
-        processorFvPatchField<vector>::typeName,
         pTraits<vector>::zero
     );
-    initPatchFields<surfaceSphericalTensorField>
+    initPatchFields
+    <
+        surfaceSphericalTensorField,
+        processorFvsPatchField<sphericalTensor>
+    >
     (
-        processorFvPatchField<sphericalTensor>::typeName,
         pTraits<sphericalTensor>::zero
     );
-    initPatchFields<surfaceSymmTensorField>
+    initPatchFields
+    <
+        surfaceSymmTensorField,
+        processorFvsPatchField<symmTensor>
+    >
     (
-        processorFvPatchField<symmTensor>::typeName,
         pTraits<symmTensor>::zero
     );
-    initPatchFields<surfaceTensorField>
+    initPatchFields<surfaceTensorField, processorFvsPatchField<tensor> >
     (
-        processorFvPatchField<tensor>::typeName,
         pTraits<tensor>::zero
     );
 
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
index c35bd4584c..ae35846720 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.H
@@ -164,10 +164,9 @@ class fvMeshDistribute
             );
 
             //- Init patch fields of certain type
-            template<class GeoField>
+            template<class GeoField, class PatchFieldType>
             void initPatchFields
             (
-                const word& patchFieldType,
                 const typename GeoField::value_type& initVal
             );
 
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
index d57f59c5dd..79972ca3fb 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistributeTemplates.C
@@ -235,10 +235,9 @@ void Foam::fvMeshDistribute::mapBoundaryFields
 
 
 // Init patch fields of certain type
-template<class GeoField>
+template<class GeoField, class PatchFieldType>
 void Foam::fvMeshDistribute::initPatchFields
 (
-    const word& patchFieldType,
     const typename GeoField::value_type& initVal
 )
 {
@@ -264,7 +263,7 @@ void Foam::fvMeshDistribute::initPatchFields
 
         forAll(bfld, patchI)
         {
-            if (bfld[patchI].type() == patchFieldType)
+            if (isA<PatchFieldType>(bfld[patchI]))
             {
                 bfld[patchI] == initVal;
             }
diff --git a/src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C b/src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C
index 9977a34705..dfaef4308e 100644
--- a/src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C
+++ b/src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C
@@ -52,7 +52,7 @@ bool Foam::adjustPhi
             const fvPatchVectorField& Up = U.boundaryField()[patchi];
             const fvsPatchScalarField& phip = phi.boundaryField()[patchi];
 
-            if (!isType<processorFvsPatchScalarField>(phip))
+            if (!isA<processorFvsPatchScalarField>(phip))
             {
                 if
                 (
@@ -128,7 +128,7 @@ bool Foam::adjustPhi
             const fvPatchVectorField& Up = U.boundaryField()[patchi];
             fvsPatchScalarField& phip = phi.boundaryField()[patchi];
 
-            if (!isType<processorFvsPatchScalarField>(phip))
+            if (!isA<processorFvsPatchScalarField>(phip))
             {
                 if
                 (
diff --git a/src/finiteVolume/cfdTools/general/include/checkPatchFieldTypes.H b/src/finiteVolume/cfdTools/general/include/checkPatchFieldTypes.H
index 94741e9e3e..f50dc6f890 100644
--- a/src/finiteVolume/cfdTools/general/include/checkPatchFieldTypes.H
+++ b/src/finiteVolume/cfdTools/general/include/checkPatchFieldTypes.H
@@ -1,4 +1,4 @@
-if (!isType<zeroGradientFvPatchScalarField>(k_.boundaryField()[patchi]))
+if (!isA<zeroGradientFvPatchScalarField>(k_.boundaryField()[patchi]))
 {
     FatalErrorIn("wall-function evaluation")
         << k_.boundaryField()[patchi].type()
@@ -8,7 +8,7 @@ if (!isType<zeroGradientFvPatchScalarField>(k_.boundaryField()[patchi]))
         << exit(FatalError);
 }
 
-if (!isType<zeroGradientFvPatchScalarField>(epsilon_.boundaryField()[patchi]))
+if (!isA<zeroGradientFvPatchScalarField>(epsilon_.boundaryField()[patchi]))
 {
     FatalErrorIn("wall-function evaluation")
         << epsilon_.boundaryField()[patchi].type()
diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
index 78beb96df6..74581231f4 100644
--- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
+++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubset.C
@@ -111,7 +111,7 @@ void Foam::fvMeshSubset::doCoupledPatches
         {
             const polyPatch& pp = oldPatches[oldPatchI];
 
-            if (typeid(pp) == typeid(processorPolyPatch))
+            if (isA<processorPolyPatch>(pp))
             {
                 const processorPolyPatch& procPatch =
                     refCast<const processorPolyPatch>(pp);
@@ -133,7 +133,7 @@ void Foam::fvMeshSubset::doCoupledPatches
         {
             const polyPatch& pp = oldPatches[oldPatchI];
 
-            if (typeid(pp) == typeid(processorPolyPatch))
+            if (isA<processorPolyPatch>(pp))
             {
                 const processorPolyPatch& procPatch =
                     refCast<const processorPolyPatch>(pp);
@@ -171,7 +171,7 @@ void Foam::fvMeshSubset::doCoupledPatches
     {
         const polyPatch& pp = oldPatches[oldPatchI];
 
-        if (typeid(pp) == typeid(cyclicPolyPatch))
+        if (isA<cyclicPolyPatch>(pp))
         {
             const cyclicPolyPatch& cycPatch =
                 refCast<const cyclicPolyPatch>(pp);
diff --git a/src/finiteVolume/fvMesh/wallDist/nearWallDist.C b/src/finiteVolume/fvMesh/wallDist/nearWallDist.C
index 3e8a351d1d..f5389d64a2 100644
--- a/src/finiteVolume/fvMesh/wallDist/nearWallDist.C
+++ b/src/finiteVolume/fvMesh/wallDist/nearWallDist.C
@@ -37,13 +37,7 @@ void Foam::nearWallDist::doAll()
     cellDistFuncs wallUtils(mesh_);
 
     // Get patch ids of walls
-    labelHashSet wallPatchIDs
-    (
-        wallUtils.getPatchIDs
-        (
-            wallPolyPatch::typeName
-        )
-    );
+    labelHashSet wallPatchIDs(wallUtils.getPatchIDs<wallPolyPatch>());
 
     // Size neighbours array for maximum possible
 
@@ -60,7 +54,7 @@ void Foam::nearWallDist::doAll()
 
         const fvPatch& patch = mesh_.boundary()[patchI];
 
-        if (patch.type() == wallFvPatch::typeName)
+        if (isA<wallFvPatch>(patch))
         {
             const polyPatch& pPatch = patch.patch();
 
diff --git a/src/finiteVolume/fvMesh/wallDist/nearWallDistNoSearch.C b/src/finiteVolume/fvMesh/wallDist/nearWallDistNoSearch.C
index 1e17f1d7c7..b9df955be1 100644
--- a/src/finiteVolume/fvMesh/wallDist/nearWallDistNoSearch.C
+++ b/src/finiteVolume/fvMesh/wallDist/nearWallDistNoSearch.C
@@ -41,7 +41,7 @@ void Foam::nearWallDistNoSearch::doAll()
     {
         fvPatchScalarField& ypatch = operator[](patchI);
 
-        if (patches[patchI].type() == wallFvPatch::typeName)
+        if (isA<wallFvPatch>(patches[patchI]))
         {
             const unallocLabelList& faceCells = patches[patchI].faceCells();
 
diff --git a/src/finiteVolume/fvMesh/wallDist/reflectionVectors.C b/src/finiteVolume/fvMesh/wallDist/reflectionVectors.C
index e4571aa303..0c7ee145ce 100644
--- a/src/finiteVolume/fvMesh/wallDist/reflectionVectors.C
+++ b/src/finiteVolume/fvMesh/wallDist/reflectionVectors.C
@@ -60,7 +60,7 @@ void Foam::reflectionVectors::correct()
     forAll(patches, patchi)
     {
         // find the nearest face for every cell
-        if (patches[patchi].type() == wallFvPatch::typeName)
+        if (isA<wallFvPatch>(patches[patchi]))
         {
             n_.boundaryField()[patchi] =
                 mesh.Sf().boundaryField()[patchi]
diff --git a/src/finiteVolume/fvMesh/wallDist/wallDist.C b/src/finiteVolume/fvMesh/wallDist/wallDist.C
index 0ac3fe87c7..322eb2819e 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallDist.C
+++ b/src/finiteVolume/fvMesh/wallDist/wallDist.C
@@ -68,7 +68,7 @@ Foam::wallDist::~wallDist()
 void Foam::wallDist::correct()
 {
     // Get patchids of walls
-    labelHashSet wallPatchIDs(getPatchIDs(wallPolyPatch::typeName));
+    labelHashSet wallPatchIDs(getPatchIDs<wallPolyPatch>());
 
     // Calculate distance starting from wallPatch faces.
     patchWave wave(cellDistFuncs::mesh(), wallPatchIDs, correctWalls_);
@@ -79,7 +79,7 @@ void Foam::wallDist::correct()
     // Transfer values on patches into boundaryField of *this
     forAll(boundaryField(), patchI)
     {
-        if (boundaryField()[patchI].type() != emptyFvPatchScalarField::typeName)
+        if (!isA<emptyFvPatchScalarField>(boundaryField()[patchI]))
         {
             scalarField& waveFld = wave.patchDistance()[patchI];
 
diff --git a/src/finiteVolume/fvMesh/wallDist/wallDistData.C b/src/finiteVolume/fvMesh/wallDist/wallDistData.C
index e9b76407dc..36f90db986 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallDistData.C
+++ b/src/finiteVolume/fvMesh/wallDist/wallDistData.C
@@ -80,7 +80,7 @@ void Foam::wallDistData<TransferType>::correct()
     //
 
     // Get patchids of walls
-    labelHashSet wallPatchIDs(getPatchIDs(wallPolyPatch::typeName));
+    labelHashSet wallPatchIDs(getPatchIDs<wallPolyPatch>());
 
     // Collect pointers to data on patches
     UPtrList<Field<Type> > patchData(mesh.boundaryMesh().size());
@@ -109,7 +109,7 @@ void Foam::wallDistData<TransferType>::correct()
     {
         scalarField& waveFld = wave.patchDistance()[patchI];
 
-        if (boundaryField()[patchI].type() != emptyFvPatchScalarField::typeName)
+        if (!isA<emptyFvPatchScalarField>(boundaryField()[patchI]))
         {
             boundaryField()[patchI].transfer(waveFld);
 
diff --git a/src/lagrangian/dieselSpray/parcel/boundaryTreatment.H b/src/lagrangian/dieselSpray/parcel/boundaryTreatment.H
index 19dea2eec0..b8702112fa 100644
--- a/src/lagrangian/dieselSpray/parcel/boundaryTreatment.H
+++ b/src/lagrangian/dieselSpray/parcel/boundaryTreatment.H
@@ -1,4 +1,4 @@
-if (isType<wallPolyPatch>(pbMesh[patch(face())]))
+if (isA<wallPolyPatch>(pbMesh[patch(face())]))
 {
     keepParcel = sDB.wall().wallTreatment(*this, face());
 
@@ -12,7 +12,7 @@ if (isType<wallPolyPatch>(pbMesh[patch(face())]))
         U() = (magUs/magV1)*v1*n() + vs*sDB.axisOfSymmetry();
     }
 }
-else if (isType<wedgePolyPatch>(pbMesh[patch(face())]))
+else if (isA<wedgePolyPatch>(pbMesh[patch(face())]))
 {
     // check if parcel is trying to move out of the domain
     label patchi = patch(face());
@@ -27,7 +27,7 @@ else if (isType<wedgePolyPatch>(pbMesh[patch(face())]))
         U() -= 2.0*Un2*n();
     }
 }
-else if (isType<symmetryPolyPatch>(pbMesh[patch(face())]))
+else if (isA<symmetryPolyPatch>(pbMesh[patch(face())]))
 {
     // check if parcel is trying to move out of the domain
     label patchi = patch(face());
diff --git a/src/lagrangian/dieselSpray/parcel/parcel.C b/src/lagrangian/dieselSpray/parcel/parcel.C
index 49c4d5db48..c1ecfee45d 100644
--- a/src/lagrangian/dieselSpray/parcel/parcel.C
+++ b/src/lagrangian/dieselSpray/parcel/parcel.C
@@ -314,7 +314,7 @@ bool Foam::parcel::move(spray& sDB)
         {
             if (face() > -1)
             {
-                if (isType<processorPolyPatch>(pbMesh[patch(face())]))
+                if (isA<processorPolyPatch>(pbMesh[patch(face())]))
                 {
                     switchProcessor = true;
                 }
diff --git a/src/lagrangian/dieselSpray/spray/spray.C b/src/lagrangian/dieselSpray/spray/spray.C
index 8dc5ad5fe0..f576ba67d9 100644
--- a/src/lagrangian/dieselSpray/spray/spray.C
+++ b/src/lagrangian/dieselSpray/spray/spray.C
@@ -242,11 +242,11 @@ Foam::spray::spray
     // check for the type of boundary condition
     forAll(bMesh, patchi)
     {
-        if (isType<symmetryPolyPatch>(bMesh[patchi]))
+        if (isA<symmetryPolyPatch>(bMesh[patchi]))
         {
             symPlaneExist = true;
         }
-        else if (isType<wedgePolyPatch>(bMesh[patchi]))
+        else if (isA<wedgePolyPatch>(bMesh[patchi]))
         {
             wedgeExist = true;
             patches[n++] = patchi;
diff --git a/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C b/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C
index 8948633e7a..78faf5c1f5 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C
@@ -82,7 +82,7 @@ bool reflectParcel::wallTreatment
 
     const polyMesh& mesh = spray_.mesh();
 
-    if (isType<wallPolyPatch>(mesh_.boundaryMesh()[patchi]))
+    if (isA<wallPolyPatch>(mesh_.boundaryMesh()[patchi]))
     {
         // wallNormal defined to point outwards of domain
         vector Sf = mesh_.Sf().boundaryField()[patchi][facei];
diff --git a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.C b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.C
index 287a0faf27..521559b72c 100644
--- a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.C
+++ b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.C
@@ -60,7 +60,7 @@ bool Foam::DsmcParcel<ParcelType>::move
 
         if (p.onBoundary() && td.keepParticle)
         {
-            if (isType<processorPolyPatch>(pbMesh[p.patch(p.face())]))
+            if (isA<processorPolyPatch>(pbMesh[p.patch(p.face())]))
             {
                 td.switchProcessor = true;
             }
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
index dded033d73..e3cc0d0fd8 100644
--- a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
@@ -52,7 +52,7 @@ Foam::FreeStream<CloudType>::FreeStream
     {
         const polyPatch& patch = cloud.mesh().boundaryMesh()[p];
 
-        if (patch.type() == polyPatch::typeName)
+        if (isType<polyPatch>(patch))
         {
             patches.append(p);
         }
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index a895e9df10..732b338d85 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -263,7 +263,7 @@ bool Foam::KinematicParcel<ParcelType>::move(TrackData& td)
 
         if (p.onBoundary() && td.keepParticle)
         {
-            if (isType<processorPolyPatch>(pbMesh[p.patch(p.face())]))
+            if (isA<processorPolyPatch>(pbMesh[p.patch(p.face())]))
             {
                 td.switchProcessor = true;
             }
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C
index 2ba95daa18..acccb66b31 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C
@@ -367,7 +367,7 @@ void Foam::referredCellList::buildReferredCellList
             // boundaries.  Separate treatment allows the serial version to run
             // transparently.
 
-            if (mesh.boundaryMesh()[patchI].type() == "cyclic")
+            if (isA<cyclicPolyPatch>(mesh.boundaryMesh()[patchI]))
             {
                 const cyclicPolyPatch& patch = refCast<const cyclicPolyPatch>
                 (
diff --git a/src/lagrangian/solidParticle/solidParticle.C b/src/lagrangian/solidParticle/solidParticle.C
index e77b9cf8a2..7c7319c090 100644
--- a/src/lagrangian/solidParticle/solidParticle.C
+++ b/src/lagrangian/solidParticle/solidParticle.C
@@ -84,7 +84,7 @@ bool Foam::solidParticle::move(solidParticle::trackData& td)
 
         if (onBoundary() && td.keepParticle)
         {
-            if (isType<processorPolyPatch>(pbMesh[patch(face())]))
+            if (isA<processorPolyPatch>(pbMesh[patch(face())]))
             {
                 td.switchProcessor = true;
             }
diff --git a/src/meshTools/cellDist/cellDistFuncs.C b/src/meshTools/cellDist/cellDistFuncs.C
index d1d3a5638c..bca2841273 100644
--- a/src/meshTools/cellDist/cellDistFuncs.C
+++ b/src/meshTools/cellDist/cellDistFuncs.C
@@ -104,27 +104,6 @@ Foam::labelHashSet Foam::cellDistFuncs::getPatchIDs
 }
 
 
-// Get patch ids of patches of certain type (e.g. 'polyProcessorPatch')
-Foam::labelHashSet Foam::cellDistFuncs::getPatchIDs(const word& wantedType)
- const
-{
-    const polyBoundaryMesh& bMesh = mesh().boundaryMesh();
-
-    labelHashSet patchIDs(bMesh.size());
-
-    forAll(bMesh, patchI)
-    {
-        const polyPatch& patch = bMesh[patchI];
-
-        if (patch.type() == wantedType)
-        {
-            patchIDs.insert(patchI);
-        }
-    }
-    return patchIDs;
-}
-
-
 // Return smallest true distance from p to any of wallFaces.
 // Note that even if normal hits face we still check other faces.
 // Note that wallFaces is untruncated and we explicitly pass in size.
diff --git a/src/meshTools/cellDist/cellDistFuncs.H b/src/meshTools/cellDist/cellDistFuncs.H
index 8dcd38d1a2..9574ecaae0 100644
--- a/src/meshTools/cellDist/cellDistFuncs.H
+++ b/src/meshTools/cellDist/cellDistFuncs.H
@@ -30,6 +30,7 @@ Description
 
 SourceFiles
     cellDistFuncs.C
+    cellDistFuncsTemplates.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -101,8 +102,10 @@ public:
         //- Get patchIDs of named patches
         labelHashSet getPatchIDs(const wordList&) const;
 
-        //- Get patchIDs of certain type (e.g. 'processorPolyPatch')
-        labelHashSet getPatchIDs(const word&) const;
+        //- Get patchIDs of/derived off certain type (e.g. 'processorPolyPatch')
+        //  Uses isA, not isType
+        template<class Type>
+        labelHashSet getPatchIDs() const;
 
         //- Calculate smallest true distance (and face index)
         //  from pt to faces wallFaces.
@@ -159,6 +162,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+#   include "cellDistFuncsTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.C b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.C
index 81ef42bee9..aba994ff35 100644
--- a/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.C
+++ b/src/meshTools/directMapped/directMappedPolyPatch/directMappedPatchBase.C
@@ -366,14 +366,24 @@ void Foam::directMappedPatchBase::calcMapping() const
     if
     (
         offset_ == vector::zero
+     && mode_ == NEARESTPATCHFACE
      && sampleRegion_ == patch_.boundaryMesh().mesh().name()
+     && samplePatch_ == patch_.name()
     )
     {
-        FatalErrorIn("directMappedPatchBase::calcMapping() const")
+        WarningIn("directMappedPatchBase::calcMapping() const")
             << "Invalid offset " << offset_ << endl
             << "Offset is the vector added to the patch face centres to"
-            << " find the cell supplying the data."
-            << exit(FatalError);
+            << " find the patch face supplying the data." << endl
+            << "Setting it to " << offset_
+            << " on the same patch, on the same region"
+            << " will find the faces themselves which does not make sense"
+            << " for anything but testing." << endl
+            << "patch_:" << patch_.name() << endl
+            << "sampleRegion_:" << sampleRegion_ << endl
+            << "mode_:" << sampleModeNames_[mode_] << endl
+            << "samplePatch_:" << samplePatch_ << endl
+            << "offset_:" << offset_ << endl;
     }
 
 
diff --git a/src/meshTools/sets/topoSets/faceSet.C b/src/meshTools/sets/topoSets/faceSet.C
index 2ce0d96899..e4a84a14e9 100644
--- a/src/meshTools/sets/topoSets/faceSet.C
+++ b/src/meshTools/sets/topoSets/faceSet.C
@@ -113,7 +113,7 @@ void faceSet::sync(const polyMesh& mesh)
         {
             const polyPatch& pp = patches[patchI];
 
-            if (isType<processorPolyPatch>(pp))
+            if (isA<processorPolyPatch>(pp))
             {
                 const processorPolyPatch& procPatch =
                     refCast<const processorPolyPatch>(pp);
@@ -145,7 +145,7 @@ void faceSet::sync(const polyMesh& mesh)
         {
             const polyPatch& pp = patches[patchI];
 
-            if (isType<processorPolyPatch>(pp))
+            if (isA<processorPolyPatch>(pp))
             {
                 const processorPolyPatch& procPatch =
                     refCast<const processorPolyPatch>(pp);
@@ -174,7 +174,7 @@ void faceSet::sync(const polyMesh& mesh)
     {
         const polyPatch& pp = patches[patchI];
 
-        if (typeid(pp) == typeid(cyclicPolyPatch))
+        if (isA<cyclicPolyPatch>(pp))
         {
             const cyclicPolyPatch& cycPatch =
                 refCast<const cyclicPolyPatch>(pp);
diff --git a/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.C b/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.C
index c017872234..2046bd1a3a 100644
--- a/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.C
+++ b/src/sampling/meshToMeshInterpolation/meshToMesh/meshToMesh.C
@@ -100,7 +100,7 @@ meshToMesh::meshToMesh
     forAll (toMesh_.boundaryMesh(), patchi)
     {
         // Add the processor patches in the toMesh to the cuttingPatches list
-        if (toMesh_.boundaryMesh()[patchi].type() == processorFvPatch::typeName)
+        if (isA<processorPolyPatch>(toMesh_.boundaryMesh()[patchi]))
         {
             cuttingPatches_.insert
             (
diff --git a/src/sampling/sampledSurface/thresholdCellFaces/thresholdCellFaces.C b/src/sampling/sampledSurface/thresholdCellFaces/thresholdCellFaces.C
index 6caaea0ff0..6acde65bf2 100644
--- a/src/sampling/sampledSurface/thresholdCellFaces/thresholdCellFaces.C
+++ b/src/sampling/sampledSurface/thresholdCellFaces/thresholdCellFaces.C
@@ -179,8 +179,8 @@ void Foam::thresholdCellFaces::calculate
 
         if
         (
-            isType<emptyPolyPatch>(p)
-         || (Pstream::parRun() && isType<processorPolyPatch>(p))
+            isA<emptyPolyPatch>(p)
+         || (Pstream::parRun() && isA<processorPolyPatch>(p))
         )
         {
             continue;
diff --git a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
index bef2864e3e..3953db92fe 100644
--- a/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
+++ b/src/topoChangerFvMesh/linearValveFvMesh/linearValveFvMesh.C
@@ -175,7 +175,7 @@ void Foam::linearValveFvMesh::makeSlidersDead()
     // Enable layering
     forAll (topoChanges, modI)
     {
-        if (typeid(topoChanges[modI]) == typeid(slidingInterface))
+        if (isA<slidingInterface>(topoChanges[modI]))
         {
             topoChanges[modI].disable();
         }
@@ -197,7 +197,7 @@ void Foam::linearValveFvMesh::makeSlidersLive()
     // Enable sliding interface
     forAll (topoChanges, modI)
     {
-        if (typeid(topoChanges[modI]) == typeid(slidingInterface))
+        if (isA<slidingInterface>(topoChanges[modI]))
         {
             topoChanges[modI].enable();
         }
@@ -220,7 +220,7 @@ bool Foam::linearValveFvMesh::attached() const
 
     forAll (topoChanges, modI)
     {
-        if (typeid(topoChanges[modI]) == typeid(slidingInterface))
+        if (isA<slidingInterface>(topoChanges[modI]))
         {
             result =
                 result
@@ -231,7 +231,7 @@ bool Foam::linearValveFvMesh::attached() const
     // Check thal all sliders are in sync (debug only)
     forAll (topoChanges, modI)
     {
-        if (typeid(topoChanges[modI]) == typeid(slidingInterface))
+        if (isA<slidingInterface>(topoChanges[modI]))
         {
             if
             (
diff --git a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
index 9dd4c56c2f..6d220ee226 100644
--- a/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
+++ b/src/topoChangerFvMesh/linearValveLayersFvMesh/linearValveLayersFvMesh.C
@@ -219,11 +219,11 @@ void Foam::linearValveLayersFvMesh::makeLayersLive()
     // Enable layering
     forAll (topoChanges, modI)
     {
-        if (typeid(topoChanges[modI]) == typeid(layerAdditionRemoval))
+        if (isA<layerAdditionRemoval>(topoChanges[modI]))
         {
             topoChanges[modI].enable();
         }
-        else if (typeid(topoChanges[modI]) == typeid(slidingInterface))
+        else if (isA<slidingInterface>(topoChanges[modI]))
         {
             topoChanges[modI].disable();
         }
@@ -245,11 +245,11 @@ void Foam::linearValveLayersFvMesh::makeSlidersLive()
     // Enable sliding interface
     forAll (topoChanges, modI)
     {
-        if (typeid(topoChanges[modI]) == typeid(layerAdditionRemoval))
+        if (isA<layerAdditionRemoval>(topoChanges[modI]))
         {
             topoChanges[modI].disable();
         }
-        else if (typeid(topoChanges[modI]) == typeid(slidingInterface))
+        else if (isA<slidingInterface>(topoChanges[modI]))
         {
             topoChanges[modI].enable();
         }
@@ -272,7 +272,7 @@ bool Foam::linearValveLayersFvMesh::attached() const
 
     forAll (topoChanges, modI)
     {
-        if (typeid(topoChanges[modI]) == typeid(slidingInterface))
+        if (isA<slidingInterface>(topoChanges[modI]))
         {
             result =
                 result
@@ -283,7 +283,7 @@ bool Foam::linearValveLayersFvMesh::attached() const
     // Check thal all sliders are in sync (debug only)
     forAll (topoChanges, modI)
     {
-        if (typeid(topoChanges[modI]) == typeid(slidingInterface))
+        if (isA<slidingInterface>(topoChanges[modI]))
         {
             if
             (
diff --git a/src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.C b/src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.C
index e366ac159f..d0ffe934ff 100644
--- a/src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.C
+++ b/src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.C
@@ -71,7 +71,7 @@ void vanDriestDelta::calcDelta()
     const fvPatchList& patches = mesh_.boundary();
     forAll(patches, patchi)
     {
-        if (isType<wallFvPatch>(patches[patchi]))
+        if (isA<wallFvPatch>(patches[patchi]))
         {
             const fvPatchVectorField& Uw = U.boundaryField()[patchi];
             const scalarField& rhow = rho.boundaryField()[patchi];
diff --git a/src/turbulenceModels/compressible/RAS/LRR/LRR.C b/src/turbulenceModels/compressible/RAS/LRR/LRR.C
index 690a83b395..e2d925c3bb 100644
--- a/src/turbulenceModels/compressible/RAS/LRR/LRR.C
+++ b/src/turbulenceModels/compressible/RAS/LRR/LRR.C
@@ -370,7 +370,7 @@ void LRR::correct()
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (typeid(curPatch) == typeid(wallFvPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             forAll(curPatch, facei)
             {
@@ -432,7 +432,7 @@ void LRR::correct()
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (typeid(curPatch) == typeid(wallFvPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             symmTensorField& Rw = R_.boundaryField()[patchi];
 
diff --git a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index 6d8e659336..66c54ec222 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -408,7 +408,7 @@ void LaunderGibsonRSTM::correct()
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (typeid(curPatch) == typeid(wallFvPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             forAll(curPatch, facei)
             {
@@ -478,7 +478,7 @@ void LaunderGibsonRSTM::correct()
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (typeid(curPatch) == typeid(wallFvPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             symmTensorField& Rw = R_.boundaryField()[patchi];
 
diff --git a/src/turbulenceModels/compressible/RAS/Make/files b/src/turbulenceModels/compressible/RAS/Make/files
index ed01f0592e..6fa7d7e963 100644
--- a/src/turbulenceModels/compressible/RAS/Make/files
+++ b/src/turbulenceModels/compressible/RAS/Make/files
@@ -37,6 +37,8 @@ $(kqRWallFunctions)/kqRWallFunction/kqRWallFunctionFvPatchFields.C
 derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
 derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
 derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
+derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C
+derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.C
 
 backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
 
diff --git a/src/turbulenceModels/compressible/RAS/Make/options b/src/turbulenceModels/compressible/RAS/Make/options
index b44e4ae64c..b2b75c8990 100644
--- a/src/turbulenceModels/compressible/RAS/Make/options
+++ b/src/turbulenceModels/compressible/RAS/Make/options
@@ -7,4 +7,6 @@ EXE_INC = \
 LIB_LIBS = \
     -lcompressibleTurbulenceModel \
     -lfiniteVolume \
+    -lbasicThermophysicalModels \
+    -lspecie \
     -lmeshTools
diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
index f0b77bb1f2..642fc686d6 100644
--- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
+++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
@@ -174,7 +174,7 @@ tmp<scalarField> RASModel::yPlus(const label patchNo, const scalar Cmu) const
     tmp<scalarField> tYp(new scalarField(curPatch.size()));
     scalarField& Yp = tYp();
 
-    if (isType<wallFvPatch>(curPatch))
+    if (isA<wallFvPatch>(curPatch))
     {
         Yp = pow025(Cmu)
             *y_[patchNo]
diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
index 700cfed818..842d9125ea 100644
--- a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
+++ b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
@@ -73,7 +73,7 @@ tmp<volScalarField> autoCreateAlphat
 
         forAll(bm, patchI)
         {
-            if (isType<wallFvPatch>(bm[patchI]))
+            if (isA<wallFvPatch>(bm[patchI]))
             {
                 alphatBoundaryTypes[patchI] =
                     RASModels::alphatWallFunctionFvPatchScalarField::typeName;
@@ -143,7 +143,7 @@ tmp<volScalarField> autoCreateMut
 
         forAll(bm, patchI)
         {
-            if (isType<wallFvPatch>(bm[patchI]))
+            if (isA<wallFvPatch>(bm[patchI]))
             {
                 mutBoundaryTypes[patchI] =
                     RASModels::mutkWallFunctionFvPatchScalarField::typeName;
diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C
index 37cc58fdd5..4c5d832170 100644
--- a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C
+++ b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C
@@ -28,7 +28,7 @@ License
 #include "Time.H"
 #include "OSspecific.H"
 
-#include "wallPolyPatch.H"
+#include "wallFvPatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -111,7 +111,7 @@ autoCreateWallFunctionField
 
         forAll(newPatchFields, patchI)
         {
-            if (isType<wallPolyPatch>(mesh.boundaryMesh()[patchI]))
+            if (isA<wallFvPatch>(mesh.boundary()[patchI]))
             {
                 newPatchFields.set
                 (
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.C
new file mode 100644
index 0000000000..469bf80074
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.C
@@ -0,0 +1,69 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "regionProperties.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::regionProperties::regionProperties(const Time& runTime)
+:
+    IOdictionary
+    (
+        IOobject
+        (
+            "regionProperties",
+            runTime.time().constant(),
+            runTime.db(),
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        )
+    ),
+    fluidRegionNames_(lookup("fluidRegionNames")),
+    solidRegionNames_(lookup("solidRegionNames"))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::regionProperties::~regionProperties()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+const Foam::List<Foam::word>& Foam::regionProperties::fluidRegionNames() const
+{
+    return fluidRegionNames_;
+}
+
+
+const Foam::List<Foam::word>& Foam::regionProperties::solidRegionNames() const
+{
+    return solidRegionNames_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.H
new file mode 100644
index 0000000000..f46e2fc1da
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.H
@@ -0,0 +1,106 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    regionProperties
+
+Description
+    Simple class to hold region information for coupled region simulations
+
+SourceFiles
+    regionProperties.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef regionProperties_H
+#define regionProperties_H
+
+#include "IOdictionary.H"
+#include "Time.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                       Class regionProperties Declaration
+\*---------------------------------------------------------------------------*/
+
+class regionProperties
+:
+    public IOdictionary
+{
+    // Private data
+
+        //- List of the fluid region names
+        List<word> fluidRegionNames_;
+
+        //- List of the solid region names
+        List<word> solidRegionNames_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        regionProperties(const regionProperties&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const regionProperties&);
+
+
+public:
+
+    // Constructors
+
+        //- Construct from components
+        regionProperties(const Time& runTime);
+
+
+    // Destructor
+
+        ~regionProperties();
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return const reference to the list of fluid region names
+            const List<word>& fluidRegionNames() const;
+
+            //- Return const reference to the list of solid region names
+            const List<word>& solidRegionNames() const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C
new file mode 100644
index 0000000000..94f9685b04
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C
@@ -0,0 +1,414 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "turbulentTemperatureCoupledBaffleFvPatchScalarField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "directMappedPatchBase.H"
+#include "regionProperties.H"
+#include "basicThermo.H"
+#include "RASModel.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+bool Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::interfaceOwner
+(
+    const polyMesh& nbrRegion,
+    const polyPatch& nbrPatch
+) const
+{
+    const fvMesh& myRegion = patch().boundaryMesh().mesh();
+
+    if (nbrRegion.name() == myRegion.name())
+    {
+        return patch().index() < nbrPatch.index();
+    }
+    else
+    {
+        const regionProperties& props =
+            myRegion.objectRegistry::parent().lookupObject<regionProperties>
+            (
+                "regionProperties"
+            );
+
+        label myIndex = findIndex(props.fluidRegionNames(), myRegion.name());
+        if (myIndex == -1)
+        {
+            label i = findIndex(props.solidRegionNames(), myRegion.name());
+
+            if (i == -1)
+            {
+                FatalErrorIn
+                (
+                    "turbulentTemperatureCoupledBaffleFvPatchScalarField"
+                    "::interfaceOwner(const polyMesh&"
+                    ", const polyPatch&)const"
+                )   << "Cannot find region " << myRegion.name()
+                    << " neither in fluids " << props.fluidRegionNames()
+                    << " nor in solids " << props.solidRegionNames()
+                    << exit(FatalError);
+            }
+            myIndex = props.fluidRegionNames().size() + i;
+        }
+        label nbrIndex = findIndex
+        (
+            props.fluidRegionNames(),
+            nbrRegion.name()
+        );
+        if (nbrIndex == -1)
+        {
+            label i = findIndex(props.solidRegionNames(), nbrRegion.name());
+
+            if (i == -1)
+            {
+                FatalErrorIn
+                (
+                    "coupleManager::interfaceOwner"
+                    "(const polyMesh&, const polyPatch&) const"
+                )   << "Cannot find region " << nbrRegion.name()
+                    << " neither in fluids " << props.fluidRegionNames()
+                    << " nor in solids " << props.solidRegionNames()
+                    << exit(FatalError);
+            }
+            nbrIndex = props.fluidRegionNames().size() + i;
+        }
+        return myIndex < nbrIndex;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::
+turbulentTemperatureCoupledBaffleFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    mixedFvPatchScalarField(p, iF),
+    neighbourFieldName_("undefined-neighbourFieldName"),
+    KName_("undefined-K")
+{
+    this->refValue() = 0.0;
+    this->refGrad() = 0.0;
+    this->valueFraction() = 1.0;
+    this->fixesValue_ = true;
+}
+
+
+Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::
+turbulentTemperatureCoupledBaffleFvPatchScalarField
+(
+    const turbulentTemperatureCoupledBaffleFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    mixedFvPatchScalarField(ptf, p, iF, mapper),
+    neighbourFieldName_(ptf.neighbourFieldName_),
+    KName_(ptf.KName_),
+    fixesValue_(ptf.fixesValue_)
+{}
+
+
+Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::
+turbulentTemperatureCoupledBaffleFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    mixedFvPatchScalarField(p, iF),
+    neighbourFieldName_(dict.lookup("neighbourFieldName")),
+    KName_(dict.lookup("K"))
+{
+    if (!isA<directMappedPatchBase>(this->patch().patch()))
+    {
+        FatalErrorIn
+        (
+            "turbulentTemperatureCoupledBaffleFvPatchScalarField::"
+            "turbulentTemperatureCoupledBaffleFvPatchScalarField\n"
+            "(\n"
+            "    const fvPatch& p,\n"
+            "    const DimensionedField<scalar, volMesh>& iF,\n"
+            "    const dictionary& dict\n"
+            ")\n"
+        )   << "\n    patch type '" << p.type()
+            << "' not type '" << directMappedPatchBase::typeName << "'"
+            << "\n    for patch " << p.name()
+            << " of field " << dimensionedInternalField().name()
+            << " in file " << dimensionedInternalField().objectPath()
+            << exit(FatalError);
+    }
+
+    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
+
+    if (dict.found("refValue"))
+    {
+        // Full restart
+        refValue() = scalarField("refValue", dict, p.size());
+        refGrad() = scalarField("refGradient", dict, p.size());
+        valueFraction() = scalarField("valueFraction", dict, p.size());
+        fixesValue_ = readBool(dict.lookup("fixesValue"));
+    }
+    else
+    {
+        // Start from user entered data. Assume fixedValue.
+        refValue() = *this;
+        refGrad() = 0.0;
+        valueFraction() = 1.0;
+        fixesValue_ = true;
+    }
+}
+
+
+Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::
+turbulentTemperatureCoupledBaffleFvPatchScalarField
+(
+    const turbulentTemperatureCoupledBaffleFvPatchScalarField& wtcsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    mixedFvPatchScalarField(wtcsf, iF),
+    neighbourFieldName_(wtcsf.neighbourFieldName_),
+    KName_(wtcsf.KName_),
+    fixesValue_(wtcsf.fixesValue_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::scalarField>
+Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::K() const
+{
+    if (KName_ == "none")
+    {
+        const compressible::RASModel& model =
+            db().lookupObject<compressible::RASModel>("RASProperties");
+
+        tmp<volScalarField> talpha = model.alphaEff();
+
+        const basicThermo& thermo =
+            db().lookupObject<basicThermo>("thermophysicalProperties");
+
+        return
+            talpha().boundaryField()[patch().index()]
+           *thermo.rho()().boundaryField()[patch().index()]
+           *thermo.Cp()().boundaryField()[patch().index()];
+    }
+    else
+    {
+        return patch().lookupPatchField<volScalarField, scalar>(KName_);
+    }
+}
+
+
+void Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    // Get the coupling information from the directMappedPatchBase
+    const directMappedPatchBase& mpp = refCast<const directMappedPatchBase>
+    (
+        patch().patch()
+    );
+    const polyMesh& nbrMesh = mpp.sampleMesh();
+    const fvPatch& nbrPatch = refCast<const fvMesh>
+    (
+        nbrMesh
+    ).boundary()[mpp.samplePolyPatch().index()];
+
+    // Force recalculation of mapping and schedule
+    const mapDistribute& distMap = mpp.map();
+    (void)distMap.schedule();
+
+    tmp<scalarField> intFld = patchInternalField();
+
+    if (interfaceOwner(nbrMesh, nbrPatch.patch()))
+    {
+        // Note: other side information could be cached - it only needs
+        // to be updated the first time round the iteration (i.e. when
+        // switching regions) but unfortunately we don't have this information.
+
+
+        // Calculate the temperature by harmonic averaging
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        const turbulentTemperatureCoupledBaffleFvPatchScalarField& nbrField =
+        refCast<const turbulentTemperatureCoupledBaffleFvPatchScalarField>
+        (
+            nbrPatch.lookupPatchField<volScalarField, scalar>
+            (
+                neighbourFieldName_
+            )
+        );
+
+        // Swap to obtain full local values of neighbour internal field
+        scalarField nbrIntFld = nbrField.patchInternalField();
+        mapDistribute::distribute
+        (
+            Pstream::defaultCommsType,
+            distMap.schedule(),
+            distMap.constructSize(),
+            distMap.subMap(),           // what to send
+            distMap.constructMap(),     // what to receive
+            nbrIntFld
+        );
+
+        // Swap to obtain full local values of neighbour K*delta
+        scalarField nbrKDelta = nbrField.K()*nbrPatch.deltaCoeffs();
+        mapDistribute::distribute
+        (
+            Pstream::defaultCommsType,
+            distMap.schedule(),
+            distMap.constructSize(),
+            distMap.subMap(),           // what to send
+            distMap.constructMap(),     // what to receive
+            nbrKDelta
+        );
+
+        tmp<scalarField> myKDelta = K()*patch().deltaCoeffs();
+
+        // Calculate common wall temperature. Reuse *this to store common value.
+        scalarField Twall
+        (
+            (myKDelta()*intFld() + nbrKDelta*nbrIntFld)
+          / (myKDelta() + nbrKDelta)
+        );
+        // Assign to me
+        fvPatchScalarField::operator=(Twall);
+        // Distribute back and assign to neighbour
+        mapDistribute::distribute
+        (
+            Pstream::defaultCommsType,
+            distMap.schedule(),
+            nbrField.size(),
+            distMap.constructMap(),     // reverse : what to send
+            distMap.subMap(),
+            Twall
+        );
+        const_cast<turbulentTemperatureCoupledBaffleFvPatchScalarField&>
+        (
+            nbrField
+        ).fvPatchScalarField::operator=(Twall);
+    }
+
+
+    // Switch between fixed value (of harmonic avg) or gradient
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    label nFixed = 0;
+
+    // Like snGrad but bypass switching on refValue/refGrad.
+    tmp<scalarField> normalGradient = (*this-intFld())*patch().deltaCoeffs();
+
+    if (debug)
+    {
+        scalar Q = gSum(K()*patch().magSf()*normalGradient());
+
+        Info<< "turbulentTemperatureCoupledBaffleFvPatchScalarField::"
+            << "updateCoeffs() :"
+            << " patch:" << patch().name()
+            << " heatFlux:" << Q
+            << " walltemperature "
+            << " min:" << gMin(*this)
+            << " max:" << gMax(*this)
+            << " avg:" << gAverage(*this)
+            << endl;
+    }
+
+    forAll(*this, i)
+    {
+        // if outgoing flux use fixed value.
+        if (normalGradient()[i] < 0.0)
+        {
+            this->refValue()[i] = operator[](i);
+            this->refGrad()[i] = 0.0;   // not used
+            this->valueFraction()[i] = 1.0;
+            nFixed++;
+        }
+        else
+        {
+            this->refValue()[i] = 0.0;  // not used
+            this->refGrad()[i] = normalGradient()[i];
+            this->valueFraction()[i] = 0.0;
+        }
+    }
+
+    reduce(nFixed, sumOp<label>());
+
+    fixesValue_ = (nFixed > 0);
+
+    if (debug)
+    {
+        label nTotSize = returnReduce(this->size(), sumOp<label>());
+
+        Info<< "turbulentTemperatureCoupledBaffleFvPatchScalarField::"
+            << "updateCoeffs() :"
+            << " patch:" << patch().name()
+            << " out of:" << nTotSize
+            << " fixedBC:" << nFixed
+            << " gradient:" << nTotSize-nFixed << endl;
+    }
+
+    mixedFvPatchScalarField::updateCoeffs();
+}
+
+
+void Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::write
+(
+    Ostream& os
+) const
+{
+    mixedFvPatchScalarField::write(os);
+    os.writeKeyword("neighbourFieldName")<< neighbourFieldName_
+        << token::END_STATEMENT << nl;
+    os.writeKeyword("K") << KName_ << token::END_STATEMENT << nl;
+    os.writeKeyword("fixesValue") << fixesValue_ << token::END_STATEMENT << nl;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+makePatchTypeField
+(
+    fvPatchScalarField,
+    turbulentTemperatureCoupledBaffleFvPatchScalarField
+);
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.H
new file mode 100644
index 0000000000..e7fac1f8e6
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.H
@@ -0,0 +1,197 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    turbulentTemperatureCoupledBaffleFvPatchScalarField
+
+Description
+    Mixed boundary condition for temperature, to be used for heat-transfer
+    on back-to-back baffles.
+
+    If my temperature is T1, neighbour is T2:
+
+    T1 > T2: my side becomes fixedValue T2 bc, other side becomes fixedGradient.
+    
+
+    Example usage:
+        myInterfacePatchName
+        {
+            type                turbulentTemperatureCoupledBaffle;
+            neighbourFieldName  T;
+            K                   K; // or none 
+            value               uniform 300;
+        }
+
+    Needs to be on underlying directMapped(Wall)FvPatch.
+
+    Note: if K is "none" looks up RASModel and basicThermo, otherwise expects
+    the solver to calculate a 'K' field.
+
+    Note: runs in parallel with arbitrary decomposition. Uses directMapped
+    functionality to calculate exchange.
+
+    Note: lags interface data so both sides use same data.
+    - problem: schedule to calculate average would interfere
+    with standard processor swaps.
+    - so: updateCoeffs sets both to same Twall. Only need to do
+    this for last outer iteration but don't have access to this.
+
+SourceFiles
+    turbulentTemperatureCoupledBaffleFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef turbulentTemperatureCoupledBaffleFvPatchScalarField_H
+#define turbulentTemperatureCoupledBaffleFvPatchScalarField_H
+
+#include "fvPatchFields.H"
+#include "mixedFvPatchFields.H"
+#include "fvPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+        Class turbulentTemperatureCoupledBaffleFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class turbulentTemperatureCoupledBaffleFvPatchScalarField
+:
+    public mixedFvPatchScalarField
+{
+    // Private data
+
+        //- Name of field on the neighbour region
+        const word neighbourFieldName_;
+        
+        //- Name of thermal conductivity field
+        const word KName_;
+
+        bool fixesValue_;
+
+
+    // Private Member Functions
+
+        //- Am I or neighbour owner of interface
+        bool interfaceOwner(const polyMesh&, const polyPatch&) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("turbulentTemperatureCoupledBaffle");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        turbulentTemperatureCoupledBaffleFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        turbulentTemperatureCoupledBaffleFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  turbulentTemperatureCoupledBaffleFvPatchScalarField onto a new patch
+        turbulentTemperatureCoupledBaffleFvPatchScalarField
+        (
+            const turbulentTemperatureCoupledBaffleFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new turbulentTemperatureCoupledBaffleFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        turbulentTemperatureCoupledBaffleFvPatchScalarField
+        (
+            const turbulentTemperatureCoupledBaffleFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new turbulentTemperatureCoupledBaffleFvPatchScalarField
+                (
+                    *this,
+                    iF
+                )
+            );
+        }
+
+
+    // Member functions
+
+        //- Get corresponding K field
+        tmp<scalarField> K() const;
+
+        //- Return true if this patch field fixes a value.
+        //  Needed to check if a level has to be specified while solving
+        //  Poissons equations.
+        virtual bool fixesValue() const
+        {
+            return fixesValue_;
+        }
+
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.C b/src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.C
index 8e9ebf2f57..d5c33529f0 100644
--- a/src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.C
+++ b/src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.C
@@ -70,7 +70,7 @@ void vanDriestDelta::calcDelta()
     const fvPatchList& patches = mesh_.boundary();
     forAll(patches, patchi)
     {
-        if (isType<wallFvPatch>(patches[patchi]))
+        if (isA<wallFvPatch>(patches[patchi]))
         {
             const fvPatchVectorField& Uw = U.boundaryField()[patchi];
             const scalarField& nuw = nu.boundaryField()[patchi];
diff --git a/src/turbulenceModels/incompressible/RAS/LRR/LRR.C b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
index 88e3bb166c..08d1b4a39a 100644
--- a/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
+++ b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
@@ -331,7 +331,7 @@ void LRR::correct()
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (typeid(curPatch) == typeid(wallFvPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             forAll(curPatch, facei)
             {
@@ -390,7 +390,7 @@ void LRR::correct()
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (typeid(curPatch) == typeid(wallFvPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             symmTensorField& Rw = R_.boundaryField()[patchi];
 
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index 33cdeec360..33939dfc15 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -373,7 +373,7 @@ void LaunderGibsonRSTM::correct()
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (typeid(curPatch) == typeid(wallFvPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             forAll(curPatch, facei)
             {
@@ -441,7 +441,7 @@ void LaunderGibsonRSTM::correct()
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (typeid(curPatch) == typeid(wallFvPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             symmTensorField& Rw = R_.boundaryField()[patchi];
 
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowReSetWallDissipation.H b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowReSetWallDissipation.H
index ef216dcf68..a150d52b92 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowReSetWallDissipation.H
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowReSetWallDissipation.H
@@ -14,7 +14,7 @@
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (isType<wallFvPatch>(curPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             forAll(curPatch, facei)
             {
@@ -29,7 +29,7 @@
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (isType<wallFvPatch>(curPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             forAll(curPatch, facei)
             {
@@ -58,7 +58,7 @@
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (isType<wallFvPatch>(curPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             forAll(curPatch, facei)
             {
diff --git a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H
index 1c3f7f8a41..54ef9356c7 100644
--- a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H
+++ b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H
@@ -14,7 +14,7 @@
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (isType<wallFvPatch>(curPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             forAll(curPatch, facei)
             {
@@ -29,7 +29,7 @@
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (isType<wallFvPatch>(curPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             forAll(curPatch, facei)
             {
@@ -58,7 +58,7 @@
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (isType<wallFvPatch>(curPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             forAll(curPatch, facei)
             {
diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
index 3e8412689b..9a6a447166 100644
--- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
+++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
@@ -169,7 +169,7 @@ tmp<scalarField> RASModel::yPlus(const label patchNo, const scalar Cmu) const
     tmp<scalarField> tYp(new scalarField(curPatch.size()));
     scalarField& Yp = tYp();
 
-    if (isType<wallFvPatch>(curPatch))
+    if (isA<wallFvPatch>(curPatch))
     {
         Yp = pow025(Cmu)
             *y_[patchNo]
diff --git a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
index 1cc7867625..242193c45d 100644
--- a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -26,7 +26,6 @@ License
 
 #include "SpalartAllmaras.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallDist.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C b/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
index f71feb939d..b2bcedff45 100644
--- a/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
+++ b/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
@@ -72,7 +72,7 @@ tmp<volScalarField> autoCreateNut
 
         forAll(bm, patchI)
         {
-            if (isType<wallFvPatch>(bm[patchI]))
+            if (isA<wallFvPatch>(bm[patchI]))
             {
                 nutBoundaryTypes[patchI] =
                     RASModels::nutkWallFunctionFvPatchScalarField::typeName;
diff --git a/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C b/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C
index 130bb90ca5..6674de9e5b 100644
--- a/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C
+++ b/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C
@@ -28,7 +28,7 @@ License
 #include "Time.H"
 #include "OSspecific.H"
 
-#include "wallPolyPatch.H"
+#include "wallFvPatch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -111,7 +111,7 @@ autoCreateWallFunctionField
 
         forAll(newPatchFields, patchI)
         {
-            if (isType<wallPolyPatch>(mesh.boundaryMesh()[patchI]))
+            if (isA<wallFvPatch>(mesh.boundary()[patchI]))
             {
                 newPatchFields.set
                 (
diff --git a/src/turbulenceModels/incompressible/RAS/include/nonLinearWallFunctionsI.H b/src/turbulenceModels/incompressible/RAS/include/nonLinearWallFunctionsI.H
index 8b10335481..fd7191683b 100644
--- a/src/turbulenceModels/incompressible/RAS/include/nonLinearWallFunctionsI.H
+++ b/src/turbulenceModels/incompressible/RAS/include/nonLinearWallFunctionsI.H
@@ -43,7 +43,7 @@ Description
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (isType<wallFvPatch>(curPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             forAll(curPatch, facei)
             {
@@ -61,7 +61,7 @@ Description
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (isType<wallFvPatch>(curPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             #include "checkPatchFieldTypes.H"
 
@@ -112,7 +112,7 @@ Description
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (isType<wallFvPatch>(curPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             forAll(curPatch, facei)
             {
diff --git a/src/turbulenceModels/incompressible/RAS/include/wallDissipationI.H b/src/turbulenceModels/incompressible/RAS/include/wallDissipationI.H
index dbd0b561b1..60dff07ae3 100644
--- a/src/turbulenceModels/incompressible/RAS/include/wallDissipationI.H
+++ b/src/turbulenceModels/incompressible/RAS/include/wallDissipationI.H
@@ -37,7 +37,7 @@ Description
     {
         const fvPatch& p = patches[patchi];
 
-        if (isType<wallFvPatch>(p))
+        if (isA<wallFvPatch>(p))
         {
             epsEqn().setValues
             (
diff --git a/src/turbulenceModels/incompressible/RAS/include/wallNonlinearViscosityI.H b/src/turbulenceModels/incompressible/RAS/include/wallNonlinearViscosityI.H
index 5ff4e58a00..e8255aea75 100644
--- a/src/turbulenceModels/incompressible/RAS/include/wallNonlinearViscosityI.H
+++ b/src/turbulenceModels/incompressible/RAS/include/wallNonlinearViscosityI.H
@@ -39,7 +39,7 @@ Description
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (isType<wallFvPatch>(curPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             const scalarField& nuw = nu().boundaryField()[patchi];
             scalarField& nutw = nut_.boundaryField()[patchi];
diff --git a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/setHotRoom.C b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/setHotRoom.C
index aca68d4e1f..3988696e62 100644
--- a/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/setHotRoom.C
+++ b/tutorials/heatTransfer/buoyantPisoFoam/hotRoom/setHotRoom/setHotRoom.C
@@ -53,9 +53,8 @@ forAll(Tpatches, patchI)
 {
     if
     (
-        (typeid(Tpatches[patchI]) == typeid(fixedValueFvPatchScalarField))
-        &&
-        (mesh.boundaryMesh()[patchI].name() == "floor") 
+        isA<fixedValueFvPatchScalarField>(Tpatches[patchI])
+     && mesh.boundaryMesh()[patchI].name() == "floor"
     )
     {
         fixedValueFvPatchScalarField& Tpatch =