diff -Naur /gpfs/gpfs_stage1/bbopenfoam/OpenFOAM-2.2.2/src/finiteVolume/fvMesh/wallDist/patchDist.C finiteVolume/fvMesh/wallDist/patchDist.C
--- /gpfs/gpfs_stage1/bbopenfoam/OpenFOAM-2.2.2/src/finiteVolume/fvMesh/wallDist/patchDist.C	2013-10-03 06:28:16.000000000 -0400
+++ finiteVolume/fvMesh/wallDist/patchDist.C	2016-07-09 19:49:34.120800000 -0400
@@ -27,6 +27,7 @@
 #include "patchWave.H"
 #include "fvMesh.H"
 #include "emptyFvPatchFields.H"
+#include "wallFvPatch.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -48,7 +49,6 @@
         mesh,
         dimensionedScalar("y", dimLength, GREAT)
     ),
-    patchIDs_(patchIDs),
     correctWalls_(correctWalls),
     nUnset_(0)
 {
@@ -67,7 +67,16 @@
 void Foam::patchDist::correct()
 {
     // Calculate distance starting from patch faces
-    patchWave wave(mesh(), patchIDs_, correctWalls_);
+    const polyBoundaryMesh& bMesh = mesh().boundaryMesh();
+    labelHashSet wallPatchIDs(bMesh.size());
+    forAll(bMesh, patchI)
+    {
+        if (isA<wallFvPatch>(bMesh[patchI]))
+        {
+            wallPatchIDs.insert(patchI);
+        }
+    }
+    patchWave wave(mesh(), wallPatchIDs, correctWalls_);
 
     // Transfer cell values from wave into *this
     transfer(wave.distance());
diff -Naur /gpfs/gpfs_stage1/bbopenfoam/OpenFOAM-2.2.2/src/finiteVolume/fvMesh/wallDist/patchDist.dep finiteVolume/fvMesh/wallDist/patchDist.dep
--- /gpfs/gpfs_stage1/bbopenfoam/OpenFOAM-2.2.2/src/finiteVolume/fvMesh/wallDist/patchDist.dep	2016-04-21 11:28:06.701115702 -0400
+++ finiteVolume/fvMesh/wallDist/patchDist.dep	2016-07-09 19:50:03.921491600 -0400
@@ -508,6 +508,8 @@
 fvMesh/wallDist/patchDist.dep: lnInclude/emptyFvPatchField.H
 fvMesh/wallDist/patchDist.dep: lnInclude/emptyFvPatch.H
 fvMesh/wallDist/patchDist.dep: lnInclude/emptyFvPatchField.C
+fvMesh/wallDist/patchDist.dep: lnInclude/wallFvPatch.H
+fvMesh/wallDist/patchDist.dep: $(WM_PROJECT_DIR)/src/OpenFOAM/lnInclude/wallPolyPatch.H
 $(OBJECTS_DIR)/patchDist.o: $(EXE_DEP)
 $(OBJECTS_DIR)/patchDist.o:
 	@SOURCE_DIR=fvMesh/wallDist
diff -Naur /gpfs/gpfs_stage1/bbopenfoam/OpenFOAM-2.2.2/src/finiteVolume/fvMesh/wallDist/patchDist.H finiteVolume/fvMesh/wallDist/patchDist.H
--- /gpfs/gpfs_stage1/bbopenfoam/OpenFOAM-2.2.2/src/finiteVolume/fvMesh/wallDist/patchDist.H	2013-10-03 06:28:16.000000000 -0400
+++ finiteVolume/fvMesh/wallDist/patchDist.H	2016-07-09 19:45:03.760264000 -0400
@@ -84,9 +84,6 @@
 
     // Private Member Data
 
-        //- Set of patch IDs
-        labelHashSet patchIDs_;
-
         //- Do accurate distance calculation for near-wall cells.
         bool correctWalls_;
 
diff -Naur /gpfs/gpfs_stage1/bbopenfoam/OpenFOAM-2.2.2/src/finiteVolume/fvMesh/wallDist/wallDist.C finiteVolume/fvMesh/wallDist/wallDist.C
--- /gpfs/gpfs_stage1/bbopenfoam/OpenFOAM-2.2.2/src/finiteVolume/fvMesh/wallDist/wallDist.C	2013-10-03 06:28:16.000000000 -0400
+++ finiteVolume/fvMesh/wallDist/wallDist.C	2016-07-09 19:50:01.696823000 -0400
@@ -41,7 +41,8 @@
         mesh.boundaryMesh().findPatchIDs<wallPolyPatch>(),
         correctWalls
     )
-{}
+{
+}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //