Merge remote branch 'OpenCFD/master' into olesenm

etc/prefs.csh-EXAMPLE

@@ -37,16 +37,17 @@
 #
 #------------------------------------------------------------------------------
 
-# Specify system compiler
-# ~~~~~~~~~~~~~~~~~~~~~~~
-set compilerInstall=system
+## Specify system compiler
+## ~~~~~~~~~~~~~~~~~~~~~~~
+#set compilerInstall=system
 
-# Specify system openmpi
-# ~~~~~~~~~~~~~~~~~~~~~~
-setenv WM_MPLIB SYSTEMOPENMPI
+## Specify system openmpi
+## ~~~~~~~~~~~~~~~~~~~~~~
+#setenv WM_MPLIB SYSTEMOPENMPI
 
 # Specify ParaView version
 # ~~~~~~~~~~~~~~~~~~~~~~~~
-setenv ParaView_VERSION 3.7.0        # eg, cvs/git version
+setenv ParaView_VERSION git        # eg, cvs/git version
+setenv ParaView_MAJOR 3.7
 
 # -----------------------------------------------------------------------------

etc/prefs.sh-EXAMPLE

@@ -47,6 +47,6 @@ export WM_MPLIB=SYSTEMOPENMPI
 
 # Specify ParaView version
 # ~~~~~~~~~~~~~~~~~~~~~~~~
-export ParaView_VERSION=3.7.0        # eg, cvs/git version
-
+export ParaView_VERSION=git        # eg, cvs/git version
+export ParaView_MAJOR=3.7
 # -----------------------------------------------------------------------------

src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C

@@ -102,9 +102,10 @@ Foam::Map<Foam::label> Foam::autoSnapDriver::getZoneBafflePatches
                             FatalErrorIn("getZoneBafflePatches(const bool)")
                                 << "Face " << faceI
                                 << " fc:" << mesh.faceCentres()[faceI]
-                                << " is in faceZone "
+                                << " in zone " << fZone.name()
+                                << " is in patch "
                                 << mesh.boundaryMesh()[oldPatchI].name()
-                                << " and in faceZone "
+                                << " and in patch "
                                 << mesh.boundaryMesh()[patchI].name()
                                 << abort(FatalError);
                         }