ENH: snappyHexMesh: Renamed auto* to snappy* to be consistent with latest Foundation changes

src/mesh/Allwmake

@@ -6,7 +6,7 @@ targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake $targetType autoMesh
+wmake $targetType snappyHexMesh
 wmake $targetType blockMesh
 wmake $targetType extrudeModel
 

src/mesh/autoMesh/Make/files

@@ -1,38 +0,0 @@
-autoHexMesh             = autoHexMesh
-autoHexMeshDriver       = $(autoHexMesh)/autoHexMeshDriver
-
-$(autoHexMeshDriver)/autoLayerDriver.C
-$(autoHexMeshDriver)/autoSnapDriver.C
-$(autoHexMeshDriver)/autoSnapDriverFeature.C
-$(autoHexMeshDriver)/autoRefineDriver.C
-
-$(autoHexMeshDriver)/layerParameters/layerParameters.C
-$(autoHexMeshDriver)/refinementParameters/refinementParameters.C
-$(autoHexMeshDriver)/snapParameters/snapParameters.C
-
-$(autoHexMesh)/meshRefinement/meshRefinementBaffles.C
-$(autoHexMesh)/meshRefinement/meshRefinement.C
-$(autoHexMesh)/meshRefinement/meshRefinementMerge.C
-$(autoHexMesh)/meshRefinement/meshRefinementProblemCells.C
-$(autoHexMesh)/meshRefinement/meshRefinementRefine.C
-$(autoHexMesh)/meshRefinement/meshRefinementGapRefine.C
-$(autoHexMesh)/meshRefinement/patchFaceOrientation.C
-
-$(autoHexMesh)/refinementFeatures/refinementFeatures.C
-$(autoHexMesh)/refinementSurfaces/surfaceZonesInfo.C
-$(autoHexMesh)/refinementSurfaces/refinementSurfaces.C
-$(autoHexMesh)/shellSurfaces/shellSurfaces.C
-$(autoHexMesh)/trackedParticle/trackedParticle.C
-$(autoHexMesh)/trackedParticle/trackedParticleCloud.C
-
-meshMover = $(autoHexMesh)/externalDisplacementMeshMover
-$(meshMover)/displacementMeshMoverMotionSolver.C
-$(meshMover)/externalDisplacementMeshMover.C
-$(meshMover)/medialAxisMeshMover.C
-$(meshMover)/displacementMotionSolverMeshMover.C
-/* $(meshMover)/pointSmoothingMeshMover.C */
-$(meshMover)/zeroFixedValue/zeroFixedValuePointPatchFields.C
-$(meshMover)/fieldSmoother/fieldSmoother.C
-
-LIB = $(FOAM_LIBBIN)/libautoMesh
-

src/mesh/snappyHexMesh/Make/files

@@ -0,0 +1,34 @@
+snappyHexMeshDriver/snappyLayerDriver.C
+snappyHexMeshDriver/snappySnapDriver.C
+snappyHexMeshDriver/snappySnapDriverFeature.C
+snappyHexMeshDriver/snappyRefineDriver.C
+
+snappyHexMeshDriver/layerParameters/layerParameters.C
+snappyHexMeshDriver/refinementParameters/refinementParameters.C
+snappyHexMeshDriver/snapParameters/snapParameters.C
+
+meshRefinement/meshRefinementBaffles.C
+meshRefinement/meshRefinement.C
+meshRefinement/meshRefinementMerge.C
+meshRefinement/meshRefinementProblemCells.C
+meshRefinement/meshRefinementRefine.C
+meshRefinement/meshRefinementGapRefine.C
+meshRefinement/patchFaceOrientation.C
+
+refinementFeatures/refinementFeatures.C
+refinementSurfaces/surfaceZonesInfo.C
+refinementSurfaces/refinementSurfaces.C
+shellSurfaces/shellSurfaces.C
+trackedParticle/trackedParticle.C
+trackedParticle/trackedParticleCloud.C
+
+externalDisplacementMeshMover/displacementMeshMoverMotionSolver.C
+externalDisplacementMeshMover/externalDisplacementMeshMover.C
+externalDisplacementMeshMover/medialAxisMeshMover.C
+externalDisplacementMeshMover/displacementMotionSolverMeshMover.C
+/* externalDisplacementMeshMover/pointSmoothingMeshMover.C */
+externalDisplacementMeshMover/zeroFixedValue/zeroFixedValuePointPatchFields.C
+externalDisplacementMeshMover/fieldSmoother/fieldSmoother.C
+
+LIB = $(FOAM_LIBBIN)/libsnappyHexMesh
+

src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C

@@ -26,7 +26,7 @@ Description
 
 \*----------------------------------------------------------------------------*/
 
-#include "autoLayerDriver.H"
+#include "snappyLayerDriver.H"
 #include "fvMesh.H"
 #include "Time.H"
 #include "meshRefinement.H"
@@ -63,7 +63,7 @@ Description
 namespace Foam
 {
 
-defineTypeNameAndDebug(autoLayerDriver, 0);
+defineTypeNameAndDebug(snappyLayerDriver, 0);
 
 } // End namespace Foam
 
@@ -71,7 +71,7 @@ defineTypeNameAndDebug(autoLayerDriver, 0);
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 // For debugging: Dump displacement to .obj files
-void Foam::autoLayerDriver::dumpDisplacement
+void Foam::snappyLayerDriver::dumpDisplacement
 (
     const fileName& prefix,
     const indirectPrimitivePatch& pp,
@@ -103,7 +103,7 @@ void Foam::autoLayerDriver::dumpDisplacement
 }
 
 
-Foam::tmp<Foam::scalarField> Foam::autoLayerDriver::avgPointData
+Foam::tmp<Foam::scalarField> Foam::snappyLayerDriver::avgPointData
 (
     const indirectPrimitivePatch& pp,
     const scalarField& pointFld
@@ -130,7 +130,7 @@ Foam::tmp<Foam::scalarField> Foam::autoLayerDriver::avgPointData
 
 // Check that primitivePatch is not multiply connected. Collect non-manifold
 // points in pointSet.
-void Foam::autoLayerDriver::checkManifold
+void Foam::snappyLayerDriver::checkManifold
 (
     const indirectPrimitivePatch& fp,
     pointSet& nonManifoldPoints
@@ -157,7 +157,7 @@ void Foam::autoLayerDriver::checkManifold
 }
 
 
-void Foam::autoLayerDriver::checkMeshManifold() const
+void Foam::snappyLayerDriver::checkMeshManifold() const
 {
     const fvMesh& mesh = meshRefiner_.mesh();
 
@@ -211,7 +211,7 @@ void Foam::autoLayerDriver::checkMeshManifold() const
 
 
 // Unset extrusion on point. Returns true if anything unset.
-bool Foam::autoLayerDriver::unmarkExtrusion
+bool Foam::snappyLayerDriver::unmarkExtrusion
 (
     const label patchPointI,
     pointField& patchDisp,
@@ -241,7 +241,7 @@ bool Foam::autoLayerDriver::unmarkExtrusion
 
 
 // Unset extrusion on face. Returns true if anything unset.
-bool Foam::autoLayerDriver::unmarkExtrusion
+bool Foam::snappyLayerDriver::unmarkExtrusion
 (
     const face& localFace,
     pointField& patchDisp,
@@ -272,7 +272,7 @@ bool Foam::autoLayerDriver::unmarkExtrusion
 
 
 // No extrusion at non-manifold points.
-void Foam::autoLayerDriver::handleNonManifolds
+void Foam::snappyLayerDriver::handleNonManifolds
 (
     const indirectPrimitivePatch& pp,
     const labelList& meshEdges,
@@ -383,7 +383,7 @@ void Foam::autoLayerDriver::handleNonManifolds
 
 
 // Parallel feature edge detection. Assumes non-manifold edges already handled.
-void Foam::autoLayerDriver::handleFeatureAngle
+void Foam::snappyLayerDriver::handleFeatureAngle
 (
     const indirectPrimitivePatch& pp,
     const labelList& meshEdges,
@@ -502,7 +502,7 @@ void Foam::autoLayerDriver::handleFeatureAngle
 // layer and compares it to the space the warped face takes up. Disables
 // extrusion if layer thickness is more than faceRatio of the thickness of
 // the face.
-void Foam::autoLayerDriver::handleWarpedFaces
+void Foam::snappyLayerDriver::handleWarpedFaces
 (
     const indirectPrimitivePatch& pp,
     const scalar faceRatio,
@@ -576,7 +576,7 @@ void Foam::autoLayerDriver::handleWarpedFaces
 
 //// No extrusion on cells with multiple patch faces. There ususally is a reason
 //// why combinePatchFaces hasn't succeeded.
-//void Foam::autoLayerDriver::handleMultiplePatchFaces
+//void Foam::snappyLayerDriver::handleMultiplePatchFaces
 //(
 //    const indirectPrimitivePatch& pp,
 //    pointField& patchDisp,
@@ -677,7 +677,7 @@ void Foam::autoLayerDriver::handleWarpedFaces
 //}
 
 
-void Foam::autoLayerDriver::setNumLayers
+void Foam::snappyLayerDriver::setNumLayers
 (
     const labelList& patchToNLayers,
     const labelList& patchIDs,
@@ -801,7 +801,7 @@ void Foam::autoLayerDriver::setNumLayers
 // Construct pointVectorField with correct boundary conditions for adding
 // layers
 Foam::tmp<Foam::pointVectorField>
-Foam::autoLayerDriver::makeLayerDisplacementField
+Foam::snappyLayerDriver::makeLayerDisplacementField
 (
     const pointMesh& pMesh,
     const labelList& numLayers
@@ -875,7 +875,7 @@ Foam::autoLayerDriver::makeLayerDisplacementField
 }
 
 
-void Foam::autoLayerDriver::growNoExtrusion
+void Foam::snappyLayerDriver::growNoExtrusion
 (
     const indirectPrimitivePatch& pp,
     pointField& patchDisp,
@@ -965,7 +965,7 @@ void Foam::autoLayerDriver::growNoExtrusion
 }
 
 
-void Foam::autoLayerDriver::determineSidePatches
+void Foam::snappyLayerDriver::determineSidePatches
 (
     const globalIndex& globalFaces,
     const labelListList& edgeGlobalFaces,
@@ -1069,7 +1069,7 @@ void Foam::autoLayerDriver::determineSidePatches
 }
 
 
-void Foam::autoLayerDriver::calculateLayerThickness
+void Foam::snappyLayerDriver::calculateLayerThickness
 (
     const indirectPrimitivePatch& pp,
     const labelList& patchIDs,
@@ -1357,7 +1357,7 @@ void Foam::autoLayerDriver::calculateLayerThickness
 
 
 // Synchronize displacement among coupled patches.
-void Foam::autoLayerDriver::syncPatchDisplacement
+void Foam::snappyLayerDriver::syncPatchDisplacement
 (
     const indirectPrimitivePatch& pp,
     const scalarField& minThickness,
@@ -1488,7 +1488,7 @@ void Foam::autoLayerDriver::syncPatchDisplacement
 // of the faces using it.
 // extrudeStatus is both input and output and gives the status of each
 // patch point.
-void Foam::autoLayerDriver::getPatchDisplacement
+void Foam::snappyLayerDriver::getPatchDisplacement
 (
     const indirectPrimitivePatch& pp,
     const scalarField& thickness,
@@ -1624,7 +1624,7 @@ void Foam::autoLayerDriver::getPatchDisplacement
 }
 
 
-bool Foam::autoLayerDriver::sameEdgeNeighbour
+bool Foam::snappyLayerDriver::sameEdgeNeighbour
 (
     const labelListList& globalEdgeFaces,
     const label myGlobalFaceI,
@@ -1644,7 +1644,7 @@ bool Foam::autoLayerDriver::sameEdgeNeighbour
 }
 
 
-void Foam::autoLayerDriver::getVertexString
+void Foam::snappyLayerDriver::getVertexString
 (
     const indirectPrimitivePatch& pp,
     const labelListList& globalEdgeFaces,
@@ -1723,7 +1723,7 @@ void Foam::autoLayerDriver::getVertexString
 // Truncates displacement
 // - for all patchFaces in the faceset displacement gets set to zero
 // - all displacement < minThickness gets set to zero
-Foam::label Foam::autoLayerDriver::truncateDisplacement
+Foam::label Foam::snappyLayerDriver::truncateDisplacement
 (
     const globalIndex& globalFaces,
     const labelListList& edgeGlobalFaces,
@@ -2038,7 +2038,7 @@ Foam::label Foam::autoLayerDriver::truncateDisplacement
 
 // Setup layer information (at points and faces) to modify mesh topology in
 // regions where layer mesh terminates.
-void Foam::autoLayerDriver::setupLayerInfoTruncation
+void Foam::snappyLayerDriver::setupLayerInfoTruncation
 (
     const indirectPrimitivePatch& pp,
     const labelList& patchNLayers,
@@ -2242,7 +2242,7 @@ void Foam::autoLayerDriver::setupLayerInfoTruncation
 
 
 // Does any of the cells use a face from faces?
-bool Foam::autoLayerDriver::cellsUseFace
+bool Foam::snappyLayerDriver::cellsUseFace
 (
     const polyMesh& mesh,
     const labelList& cellLabels,
@@ -2268,7 +2268,7 @@ bool Foam::autoLayerDriver::cellsUseFace
 // Checks the newly added cells and locally unmarks points so they
 // will not get extruded next time round. Returns global number of unmarked
 // points (0 if all was fine)
-Foam::label Foam::autoLayerDriver::checkAndUnmark
+Foam::label Foam::snappyLayerDriver::checkAndUnmark
 (
     const addPatchCellLayer& addLayer,
     const dictionary& meshQualityDict,
@@ -2403,7 +2403,7 @@ Foam::label Foam::autoLayerDriver::checkAndUnmark
 
 
 //- Count global number of extruded faces
-Foam::label Foam::autoLayerDriver::countExtrusion
+Foam::label Foam::snappyLayerDriver::countExtrusion
 (
     const indirectPrimitivePatch& pp,
     const List<extrudeMode>& extrudeStatus
@@ -2433,7 +2433,7 @@ Foam::label Foam::autoLayerDriver::countExtrusion
 }
 
 
-Foam::List<Foam::labelPair> Foam::autoLayerDriver::getBafflesOnAddedMesh
+Foam::List<Foam::labelPair> Foam::snappyLayerDriver::getBafflesOnAddedMesh
 (
     const polyMesh& mesh,
     const labelList& newToOldFaces,
@@ -2495,7 +2495,7 @@ Foam::List<Foam::labelPair> Foam::autoLayerDriver::getBafflesOnAddedMesh
 
 
 // Collect layer faces and layer cells into mesh fields for ease of handling
-void Foam::autoLayerDriver::getLayerCellsFaces
+void Foam::snappyLayerDriver::getLayerCellsFaces
 (
     const polyMesh& mesh,
     const addPatchCellLayer& addLayer,
@@ -2550,7 +2550,7 @@ void Foam::autoLayerDriver::getLayerCellsFaces
 }
 
 
-void Foam::autoLayerDriver::printLayerData
+void Foam::snappyLayerDriver::printLayerData
 (
     const fvMesh& mesh,
     const labelList& patchIDs,
@@ -2645,7 +2645,7 @@ void Foam::autoLayerDriver::printLayerData
 }
 
 
-bool Foam::autoLayerDriver::writeLayerSets
+bool Foam::snappyLayerDriver::writeLayerSets
 (
     const fvMesh& mesh,
     const labelList& cellNLayers,
@@ -2708,7 +2708,7 @@ bool Foam::autoLayerDriver::writeLayerSets
 }
 
 
-bool Foam::autoLayerDriver::writeLayerData
+bool Foam::snappyLayerDriver::writeLayerData
 (
     const fvMesh& mesh,
     const labelList& patchIDs,
@@ -2854,7 +2854,7 @@ bool Foam::autoLayerDriver::writeLayerData
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::autoLayerDriver::autoLayerDriver
+Foam::snappyLayerDriver::snappyLayerDriver
 (
     meshRefinement& meshRefiner,
     const labelList& globalToMasterPatch,
@@ -2869,7 +2869,7 @@ Foam::autoLayerDriver::autoLayerDriver
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::autoLayerDriver::mergePatchFacesUndo
+void Foam::snappyLayerDriver::mergePatchFacesUndo
 (
     const layerParameters& layerParams,
     const dictionary& motionDict
@@ -2920,7 +2920,7 @@ void Foam::autoLayerDriver::mergePatchFacesUndo
 }
 
 
-void Foam::autoLayerDriver::addLayers
+void Foam::snappyLayerDriver::addLayers
 (
     const layerParameters& layerParams,
     const dictionary& motionDict,
@@ -3641,7 +3641,7 @@ void Foam::autoLayerDriver::addLayers
                 Info<< "Writing shrunk mesh to time "
                     << meshRefiner_.timeName() << endl;
 
-                // See comment in autoSnapDriver why we should not remove
+                // See comment in snappySnapDriver why we should not remove
                 // meshPhi using mesh.clearOut().
 
                 meshRefiner_.write
@@ -4208,7 +4208,7 @@ void Foam::autoLayerDriver::addLayers
 }
 
 
-void Foam::autoLayerDriver::doLayers
+void Foam::snappyLayerDriver::doLayers
 (
     const dictionary& shrinkDict,
     const dictionary& motionDict,

src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.H

@@ -22,18 +22,18 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::autoLayerDriver
+    Foam::snappyLayerDriver
 
 Description
     All to do with adding layers
 
 SourceFiles
-    autoLayerDriver.C
+    snappyLayerDriver.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef autoLayerDriver_H
+#ifndef snappyLayerDriver_H
-#define autoLayerDriver_H
+#define snappyLayerDriver_H
 
 #include "meshRefinement.H"
 
@@ -51,10 +51,10 @@ class faceSet;
 class layerParameters;
 
 /*---------------------------------------------------------------------------*\
-                           Class autoLayerDriver Declaration
+                           Class snappyLayerDriver Declaration
 \*---------------------------------------------------------------------------*/
 
-class autoLayerDriver
+class snappyLayerDriver
 {
 public:
 
@@ -558,21 +558,21 @@ private:
 
 
         //- Disallow default bitwise copy construct
-        autoLayerDriver(const autoLayerDriver&);
+        snappyLayerDriver(const snappyLayerDriver&);
 
         //- Disallow default bitwise assignment
-        void operator=(const autoLayerDriver&);
+        void operator=(const snappyLayerDriver&);
 
 
 public:
 
     //- Runtime type information
-    ClassName("autoLayerDriver");
+    ClassName("snappyLayerDriver");
 
     // Constructors
 
         //- Construct from components
-        autoLayerDriver
+        snappyLayerDriver
         (
             meshRefinement& meshRefiner,
             const labelList& globalToMasterPatch,
@@ -622,7 +622,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "autoLayerDriverTemplates.C"
+#   include "snappyLayerDriverTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriverTemplates.C

@@ -23,13 +23,13 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "autoLayerDriver.H"
+#include "snappyLayerDriver.H"
 #include "syncTools.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>
-void Foam::autoLayerDriver::averageNeighbours
+void Foam::snappyLayerDriver::averageNeighbours
 (
     const polyMesh& mesh,
     const PackedBoolList& isMasterEdge,

src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C

@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "autoRefineDriver.H"
+#include "snappyRefineDriver.H"
 #include "meshRefinement.H"
 #include "fvMesh.H"
 #include "Time.H"
@@ -45,7 +45,7 @@ License
 namespace Foam
 {
 
-defineTypeNameAndDebug(autoRefineDriver, 0);
+defineTypeNameAndDebug(snappyRefineDriver, 0);
 
 } // End namespace Foam
 
@@ -53,7 +53,7 @@ defineTypeNameAndDebug(autoRefineDriver, 0);
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 // Construct from components
-Foam::autoRefineDriver::autoRefineDriver
+Foam::snappyRefineDriver::snappyRefineDriver
 (
     meshRefinement& meshRefiner,
     decompositionMethod& decomposer,
@@ -72,7 +72,7 @@ Foam::autoRefineDriver::autoRefineDriver
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::label Foam::autoRefineDriver::featureEdgeRefine
+Foam::label Foam::snappyRefineDriver::featureEdgeRefine
 (
     const refinementParameters& refineParams,
     const label maxIter,
@@ -182,7 +182,7 @@ Foam::label Foam::autoRefineDriver::featureEdgeRefine
 }
 
 
-Foam::label Foam::autoRefineDriver::smallFeatureRefine
+Foam::label Foam::snappyRefineDriver::smallFeatureRefine
 (
     const refinementParameters& refineParams,
     const label maxIter
@@ -304,7 +304,7 @@ Foam::label Foam::autoRefineDriver::smallFeatureRefine
 }
 
 
-Foam::label Foam::autoRefineDriver::surfaceOnlyRefine
+Foam::label Foam::snappyRefineDriver::surfaceOnlyRefine
 (
     const refinementParameters& refineParams,
     const label maxIter
@@ -427,7 +427,7 @@ Foam::label Foam::autoRefineDriver::surfaceOnlyRefine
 }
 
 
-Foam::label Foam::autoRefineDriver::gapOnlyRefine
+Foam::label Foam::snappyRefineDriver::gapOnlyRefine
 (
     const refinementParameters& refineParams,
     const label maxIter
@@ -658,7 +658,7 @@ Foam::label Foam::autoRefineDriver::gapOnlyRefine
 }
 
 
-Foam::label Foam::autoRefineDriver::bigGapOnlyRefine
+Foam::label Foam::snappyRefineDriver::bigGapOnlyRefine
 (
     const refinementParameters& refineParams,
     const bool spreadGapSize,
@@ -800,7 +800,7 @@ Foam::label Foam::autoRefineDriver::bigGapOnlyRefine
 }
 
 
-Foam::label Foam::autoRefineDriver::danglingCellRefine
+Foam::label Foam::snappyRefineDriver::danglingCellRefine
 (
     const refinementParameters& refineParams,
     const label nFaces,
@@ -946,7 +946,7 @@ Foam::label Foam::autoRefineDriver::danglingCellRefine
 
 // Detect cells with opposing intersected faces of differing refinement
 // level and refine them.
-Foam::label Foam::autoRefineDriver::refinementInterfaceRefine
+Foam::label Foam::snappyRefineDriver::refinementInterfaceRefine
 (
     const refinementParameters& refineParams,
     const label maxIter
@@ -1286,7 +1286,7 @@ Foam::label Foam::autoRefineDriver::refinementInterfaceRefine
 }
 
 
-void Foam::autoRefineDriver::removeInsideCells
+void Foam::snappyRefineDriver::removeInsideCells
 (
     const refinementParameters& refineParams,
     const label nBufferLayers
@@ -1334,7 +1334,7 @@ void Foam::autoRefineDriver::removeInsideCells
 }
 
 
-Foam::label Foam::autoRefineDriver::shellRefine
+Foam::label Foam::snappyRefineDriver::shellRefine
 (
     const refinementParameters& refineParams,
     const label maxIter
@@ -1507,7 +1507,7 @@ Foam::label Foam::autoRefineDriver::shellRefine
 }
 
 
-void Foam::autoRefineDriver::baffleAndSplitMesh
+void Foam::snappyRefineDriver::baffleAndSplitMesh
 (
     const refinementParameters& refineParams,
     const snapParameters& snapParams,
@@ -1570,7 +1570,7 @@ void Foam::autoRefineDriver::baffleAndSplitMesh
 }
 
 
-void Foam::autoRefineDriver::zonify
+void Foam::snappyRefineDriver::zonify
 (
     const refinementParameters& refineParams,
     wordPairHashTable& zonesToFaceZone
@@ -1633,7 +1633,7 @@ void Foam::autoRefineDriver::zonify
 }
 
 
-void Foam::autoRefineDriver::splitAndMergeBaffles
+void Foam::snappyRefineDriver::splitAndMergeBaffles
 (
     const refinementParameters& refineParams,
     const snapParameters& snapParams,
@@ -1758,7 +1758,7 @@ void Foam::autoRefineDriver::splitAndMergeBaffles
 }
 
 
-void Foam::autoRefineDriver::addFaceZones
+void Foam::snappyRefineDriver::addFaceZones
 (
     meshRefinement& meshRefiner,
     const refinementParameters& refineParams,
@@ -1832,7 +1832,7 @@ void Foam::autoRefineDriver::addFaceZones
 }
 
 
-void Foam::autoRefineDriver::mergePatchFaces
+void Foam::snappyRefineDriver::mergePatchFaces
 (
     const bool geometricMerge,
     const refinementParameters& refineParams,
@@ -1883,7 +1883,7 @@ void Foam::autoRefineDriver::mergePatchFaces
 }
 
 
-void Foam::autoRefineDriver::doRefine
+void Foam::snappyRefineDriver::doRefine
 (
     const dictionary& refineDict,
     const refinementParameters& refineParams,

src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.H

@@ -22,17 +22,17 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::autoRefineDriver
+    Foam::snappyRefineDriver
 
 Description
 
 SourceFiles
-    autoRefineDriver.C
+    snappyRefineDriver.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef autoRefineDriver_H
+#ifndef snappyRefineDriver_H
-#define autoRefineDriver_H
+#define snappyRefineDriver_H
 
 #include "wordPairHashTable.H"
 #include "labelList.H"
@@ -51,10 +51,10 @@ class decompositionMethod;
 class fvMeshDistribute;
 
 /*---------------------------------------------------------------------------*\
-                           Class autoRefineDriver Declaration
+                           Class snappyRefineDriver Declaration
 \*---------------------------------------------------------------------------*/
 
-class autoRefineDriver
+class snappyRefineDriver
 {
     // Private data
 
@@ -175,22 +175,22 @@ class autoRefineDriver
         );
 
         //- Disallow default bitwise copy construct
-        autoRefineDriver(const autoRefineDriver&);
+        snappyRefineDriver(const snappyRefineDriver&);
 
         //- Disallow default bitwise assignment
-        void operator=(const autoRefineDriver&);
+        void operator=(const snappyRefineDriver&);
 
 
 public:
 
     //- Runtime type information
-    ClassName("autoRefineDriver");
+    ClassName("snappyRefineDriver");
 
 
     // Constructors
 
         //- Construct from components
-        autoRefineDriver
+        snappyRefineDriver
         (
             meshRefinement& meshRefiner,
             decompositionMethod& decomposer,

src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.C

@@ -26,7 +26,7 @@ Description
 
 \*----------------------------------------------------------------------------*/
 
-#include "autoSnapDriver.H"
+#include "snappySnapDriver.H"
 #include "motionSmoother.H"
 #include "polyTopoChange.H"
 #include "syncTools.H"
@@ -51,7 +51,7 @@ Description
 namespace Foam
 {
 
-defineTypeNameAndDebug(autoSnapDriver, 0);
+defineTypeNameAndDebug(snappySnapDriver, 0);
 
 } // End namespace Foam
 
@@ -60,7 +60,7 @@ defineTypeNameAndDebug(autoSnapDriver, 0);
 
 // Calculate geometrically collocated points, Requires PackedList to be
 // sized and initalised!
-Foam::label Foam::autoSnapDriver::getCollocatedPoints
+Foam::label Foam::snappySnapDriver::getCollocatedPoints
 (
     const scalar tol,
     const pointField& points,
@@ -120,7 +120,7 @@ Foam::label Foam::autoSnapDriver::getCollocatedPoints
 }
 
 
-Foam::tmp<Foam::pointField> Foam::autoSnapDriver::smoothInternalDisplacement
+Foam::tmp<Foam::pointField> Foam::snappySnapDriver::smoothInternalDisplacement
 (
     const meshRefinement& meshRefiner,
     const motionSmoother& meshMover
@@ -300,7 +300,7 @@ Foam::tmp<Foam::pointField> Foam::autoSnapDriver::smoothInternalDisplacement
 
 
 // Calculate displacement as average of patch points.
-Foam::tmp<Foam::pointField> Foam::autoSnapDriver::smoothPatchDisplacement
+Foam::tmp<Foam::pointField> Foam::snappySnapDriver::smoothPatchDisplacement
 (
     const motionSmoother& meshMover,
     const List<labelPair>& baffles
@@ -588,7 +588,7 @@ Foam::tmp<Foam::pointField> Foam::autoSnapDriver::smoothPatchDisplacement
     return tpatchDisp;
 }
 //XXXXXXX
-//Foam::tmp<Foam::pointField> Foam::autoSnapDriver::avg
+//Foam::tmp<Foam::pointField> Foam::snappySnapDriver::avg
 //(
 //    const indirectPrimitivePatch& pp,
 //    const pointField& localPoints
@@ -620,7 +620,7 @@ Foam::tmp<Foam::pointField> Foam::autoSnapDriver::smoothPatchDisplacement
 //    return tavg;
 //}
 //Foam::tmp<Foam::pointField>
-//Foam::autoSnapDriver::smoothLambdaMuPatchDisplacement
+//Foam::snappySnapDriver::smoothLambdaMuPatchDisplacement
 //(
 //    const motionSmoother& meshMover,
 //    const List<labelPair>& baffles
@@ -650,7 +650,7 @@ Foam::tmp<Foam::pointField> Foam::autoSnapDriver::smoothPatchDisplacement
 //XXXXXXX
 
 
-Foam::tmp<Foam::scalarField> Foam::autoSnapDriver::edgePatchDist
+Foam::tmp<Foam::scalarField> Foam::snappySnapDriver::edgePatchDist
 (
     const pointMesh& pMesh,
     const indirectPrimitivePatch& pp
@@ -696,7 +696,7 @@ Foam::tmp<Foam::scalarField> Foam::autoSnapDriver::edgePatchDist
 }
 
 
-void Foam::autoSnapDriver::dumpMove
+void Foam::snappySnapDriver::dumpMove
 (
     const fileName& fName,
     const pointField& meshPts,
@@ -725,7 +725,7 @@ void Foam::autoSnapDriver::dumpMove
 
 // Check whether all displacement vectors point outwards of patch. Return true
 // if so.
-bool Foam::autoSnapDriver::outwardsDisplacement
+bool Foam::snappySnapDriver::outwardsDisplacement
 (
     const indirectPrimitivePatch& pp,
     const vectorField& patchDisp
@@ -768,7 +768,7 @@ bool Foam::autoSnapDriver::outwardsDisplacement
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::autoSnapDriver::autoSnapDriver
+Foam::snappySnapDriver::snappySnapDriver
 (
     meshRefinement& meshRefiner,
     const labelList& globalToMasterPatch,
@@ -783,7 +783,7 @@ Foam::autoSnapDriver::autoSnapDriver
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::scalarField Foam::autoSnapDriver::calcSnapDistance
+Foam::scalarField Foam::snappySnapDriver::calcSnapDistance
 (
     const fvMesh& mesh,
     const snapParameters& snapParams,
@@ -823,7 +823,7 @@ Foam::scalarField Foam::autoSnapDriver::calcSnapDistance
 }
 
 
-void Foam::autoSnapDriver::preSmoothPatch
+void Foam::snappySnapDriver::preSmoothPatch
 (
     const meshRefinement& meshRefiner,
     const snapParameters& snapParams,
@@ -939,7 +939,7 @@ void Foam::autoSnapDriver::preSmoothPatch
 
 
 // Get (pp-local) indices of points that are both on zone and on patched surface
-Foam::labelList Foam::autoSnapDriver::getZoneSurfacePoints
+Foam::labelList Foam::snappySnapDriver::getZoneSurfacePoints
 (
     const fvMesh& mesh,
     const indirectPrimitivePatch& pp,
@@ -986,7 +986,7 @@ Foam::labelList Foam::autoSnapDriver::getZoneSurfacePoints
 }
 
 
-Foam::tmp<Foam::pointField> Foam::autoSnapDriver::avgCellCentres
+Foam::tmp<Foam::pointField> Foam::snappySnapDriver::avgCellCentres
 (
     const fvMesh& mesh,
     const indirectPrimitivePatch& pp
@@ -1042,14 +1042,14 @@ Foam::tmp<Foam::pointField> Foam::autoSnapDriver::avgCellCentres
 }
 
 
-//Foam::tmp<Foam::scalarField> Foam::autoSnapDriver::calcEdgeLen
+//Foam::tmp<Foam::scalarField> Foam::snappySnapDriver::calcEdgeLen
 //(
 //    const indirectPrimitivePatch& pp
 //) const
 //{
 //    // Get local edge length based on refinement level
 //    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//    // (Ripped from autoLayerDriver)
+//    // (Ripped from snappyLayerDriver)
 //
 //    tmp<scalarField> tedgeLen(new scalarField(pp.nPoints()));
 //    scalarField& edgeLen = tedgeLen();
@@ -1090,7 +1090,7 @@ Foam::tmp<Foam::pointField> Foam::autoSnapDriver::avgCellCentres
 //}
 
 
-void Foam::autoSnapDriver::detectNearSurfaces
+void Foam::snappySnapDriver::detectNearSurfaces
 (
     const scalar planarCos,
     const indirectPrimitivePatch& pp,
@@ -1688,7 +1688,7 @@ void Foam::autoSnapDriver::detectNearSurfaces
 }
 
 
-void Foam::autoSnapDriver::calcNearestSurface
+void Foam::snappySnapDriver::calcNearestSurface
 (
     const refinementSurfaces& surfaces,
 
@@ -1768,7 +1768,7 @@ void Foam::autoSnapDriver::calcNearestSurface
 }
 
 
-Foam::vectorField Foam::autoSnapDriver::calcNearestSurface
+Foam::vectorField Foam::snappySnapDriver::calcNearestSurface
 (
     const bool strictRegionSnap,
     const meshRefinement& meshRefiner,
@@ -2091,7 +2091,7 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurface
 }
 
 
-void Foam::autoSnapDriver::smoothDisplacement
+void Foam::snappySnapDriver::smoothDisplacement
 (
     const snapParameters& snapParams,
     motionSmoother& meshMover
@@ -2160,7 +2160,7 @@ void Foam::autoSnapDriver::smoothDisplacement
 }
 
 
-bool Foam::autoSnapDriver::scaleMesh
+bool Foam::snappySnapDriver::scaleMesh
 (
     const snapParameters& snapParams,
     const label nInitErrors,
@@ -2226,7 +2226,7 @@ bool Foam::autoSnapDriver::scaleMesh
 // - calculate face-wise snap distance as max of point-wise
 // - calculate face-wise nearest surface point
 // - repatch face according to patch for surface point.
-Foam::autoPtr<Foam::mapPolyMesh> Foam::autoSnapDriver::repatchToSurface
+Foam::autoPtr<Foam::mapPolyMesh> Foam::snappySnapDriver::repatchToSurface
 (
     const snapParameters& snapParams,
     const labelList& adaptPatchIDs,
@@ -2396,7 +2396,7 @@ Foam::autoPtr<Foam::mapPolyMesh> Foam::autoSnapDriver::repatchToSurface
 }
 
 
-void Foam::autoSnapDriver::detectWarpedFaces
+void Foam::snappySnapDriver::detectWarpedFaces
 (
     const scalar featureCos,
     const indirectPrimitivePatch& pp,
@@ -2490,7 +2490,7 @@ void Foam::autoSnapDriver::detectWarpedFaces
 }
 
 
-Foam::labelList Foam::autoSnapDriver::getInternalOrBaffleDuplicateFace() const
+Foam::labelList Foam::snappySnapDriver::getInternalOrBaffleDuplicateFace() const
 {
     const fvMesh& mesh = meshRefiner_.mesh();
 
@@ -2524,7 +2524,7 @@ Foam::labelList Foam::autoSnapDriver::getInternalOrBaffleDuplicateFace() const
 }
 
 
-void Foam::autoSnapDriver::doSnap
+void Foam::snappySnapDriver::doSnap
 (
     const dictionary& snapDict,
     const dictionary& motionDict,

src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriver.H

@@ -22,19 +22,19 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::autoSnapDriver
+    Foam::snappySnapDriver
 
 Description
     All to do with snapping to surface
 
 SourceFiles
-    autoSnapDriver.C
+    snappySnapDriver.C
-    autoSnapDriverFeature.C
+    snappySnapDriverFeature.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef autoSnapDriver_H
+#ifndef snappySnapDriver_H
-#define autoSnapDriver_H
+#define snappySnapDriver_H
 
 #include "meshRefinement.H"
 #include "DynamicField.H"
@@ -51,10 +51,10 @@ class snapParameters;
 class pointConstraint;
 
 /*---------------------------------------------------------------------------*\
-                           Class autoSnapDriver Declaration
+                           Class snappySnapDriver Declaration
 \*---------------------------------------------------------------------------*/
 
-class autoSnapDriver
+class snappySnapDriver
 {
     // Private data
 
@@ -650,22 +650,22 @@ class autoSnapDriver
 
 
         //- Disallow default bitwise copy construct
-        autoSnapDriver(const autoSnapDriver&);
+        snappySnapDriver(const snappySnapDriver&);
 
         //- Disallow default bitwise assignment
-        void operator=(const autoSnapDriver&);
+        void operator=(const snappySnapDriver&);
 
 
 public:
 
     //- Runtime type information
-    ClassName("autoSnapDriver");
+    ClassName("snappySnapDriver");
 
 
     // Constructors
 
         //- Construct from components
-        autoSnapDriver
+        snappySnapDriver
         (
             meshRefinement& meshRefiner,
             const labelList& globalToMasterPatch,
@@ -787,7 +787,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "autoSnapDriverTemplates.C"
+#   include "snappySnapDriverTemplates.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverFeature.C

@@ -23,7 +23,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "autoSnapDriver.H"
+#include "snappySnapDriver.H"
 #include "polyTopoChange.H"
 #include "syncTools.H"
 #include "fvMesh.H"
@@ -65,7 +65,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-bool Foam::autoSnapDriver::isFeaturePoint
+bool Foam::snappySnapDriver::isFeaturePoint
 (
     const scalar featureCos,
     const indirectPrimitivePatch& pp,
@@ -126,7 +126,7 @@ bool Foam::autoSnapDriver::isFeaturePoint
 }
 
 
-void Foam::autoSnapDriver::smoothAndConstrain
+void Foam::snappySnapDriver::smoothAndConstrain
 (
     const PackedBoolList& isPatchMasterEdge,
     const indirectPrimitivePatch& pp,
@@ -217,7 +217,7 @@ void Foam::autoSnapDriver::smoothAndConstrain
 }
 
 
-void Foam::autoSnapDriver::calcNearestFace
+void Foam::snappySnapDriver::calcNearestFace
 (
     const label iter,
     const indirectPrimitivePatch& pp,
@@ -443,7 +443,7 @@ void Foam::autoSnapDriver::calcNearestFace
 // - faceSurfaceNormal
 // - faceDisp
 // - faceCentres&faceNormal
-void Foam::autoSnapDriver::calcNearestFacePointProperties
+void Foam::snappySnapDriver::calcNearestFacePointProperties
 (
     const label iter,
     const indirectPrimitivePatch& pp,
@@ -687,7 +687,7 @@ void Foam::autoSnapDriver::calcNearestFacePointProperties
 // Gets passed in offset to nearest point on feature edge. Calculates
 // if the point has a different number of faces on either side of the feature
 // and if so attracts the point to that non-dominant plane.
-void Foam::autoSnapDriver::correctAttraction
+void Foam::snappySnapDriver::correctAttraction
 (
     const DynamicList<point>& surfacePoints,
     const DynamicList<label>& surfaceCounts,
@@ -725,7 +725,7 @@ void Foam::autoSnapDriver::correctAttraction
 }
 
 
-Foam::pointIndexHit Foam::autoSnapDriver::findMultiPatchPoint
+Foam::pointIndexHit Foam::snappySnapDriver::findMultiPatchPoint
 (
     const point& pt,
     const labelList& patchIDs,
@@ -749,7 +749,7 @@ Foam::pointIndexHit Foam::autoSnapDriver::findMultiPatchPoint
 }
 
 
-Foam::label Foam::autoSnapDriver::findNormal
+Foam::label Foam::snappySnapDriver::findNormal
 (
     const scalar featureCos,
     const vector& n,
@@ -782,7 +782,7 @@ Foam::label Foam::autoSnapDriver::findNormal
 //                     (so geometric feature edge is also a region edge)
 // - true , index=1  : multiple patches on same normals plane i.e. flat region
 //                     edge
-Foam::pointIndexHit Foam::autoSnapDriver::findMultiPatchPoint
+Foam::pointIndexHit Foam::snappySnapDriver::findMultiPatchPoint
 (
     const point& pt,
     const labelList& patchIDs,
@@ -862,7 +862,7 @@ Foam::pointIndexHit Foam::autoSnapDriver::findMultiPatchPoint
 }
 
 
-void Foam::autoSnapDriver::writeStats
+void Foam::snappySnapDriver::writeStats
 (
     const indirectPrimitivePatch& pp,
     const PackedBoolList& isPatchMasterPoint,
@@ -910,7 +910,7 @@ void Foam::autoSnapDriver::writeStats
 }
 
 
-void Foam::autoSnapDriver::featureAttractionUsingReconstruction
+void Foam::snappySnapDriver::featureAttractionUsingReconstruction
 (
     const label iter,
     const scalar featureCos,
@@ -1103,7 +1103,7 @@ void Foam::autoSnapDriver::featureAttractionUsingReconstruction
 
 
 // Special version that calculates attraction in one go
-void Foam::autoSnapDriver::featureAttractionUsingReconstruction
+void Foam::snappySnapDriver::featureAttractionUsingReconstruction
 (
     const label iter,
     const scalar featureCos,
@@ -1209,7 +1209,7 @@ void Foam::autoSnapDriver::featureAttractionUsingReconstruction
 }
 
 
-void Foam::autoSnapDriver::stringFeatureEdges
+void Foam::snappySnapDriver::stringFeatureEdges
 (
     const label iter,
     const scalar featureCos,
@@ -1398,7 +1398,7 @@ void Foam::autoSnapDriver::stringFeatureEdges
 }
 
 
-void Foam::autoSnapDriver::releasePointsNextToMultiPatch
+void Foam::snappySnapDriver::releasePointsNextToMultiPatch
 (
     const label iter,
     const scalar featureCos,
@@ -1529,7 +1529,7 @@ void Foam::autoSnapDriver::releasePointsNextToMultiPatch
 }
 
 
-Foam::labelPair Foam::autoSnapDriver::findDiagonalAttraction
+Foam::labelPair Foam::snappySnapDriver::findDiagonalAttraction
 (
     const indirectPrimitivePatch& pp,
     const vectorField& patchAttraction,
@@ -1572,7 +1572,7 @@ Foam::labelPair Foam::autoSnapDriver::findDiagonalAttraction
 }
 
 
-bool Foam::autoSnapDriver::isSplitAlignedWithFeature
+bool Foam::snappySnapDriver::isSplitAlignedWithFeature
 (
     const scalar featureCos,
     const point& p0,
@@ -1612,7 +1612,7 @@ bool Foam::autoSnapDriver::isSplitAlignedWithFeature
 
 
 // Is situation very concave
-bool Foam::autoSnapDriver::isConcave
+bool Foam::snappySnapDriver::isConcave
 (
     const point& c0,
     const vector& area0,
@@ -1662,7 +1662,7 @@ bool Foam::autoSnapDriver::isConcave
 }
 
 
-Foam::labelPair Foam::autoSnapDriver::findDiagonalAttraction
+Foam::labelPair Foam::snappySnapDriver::findDiagonalAttraction
 (
     const scalar featureCos,
     const scalar concaveCos,
@@ -1881,7 +1881,7 @@ Foam::labelPair Foam::autoSnapDriver::findDiagonalAttraction
 }
 
 
-void Foam::autoSnapDriver::splitDiagonals
+void Foam::snappySnapDriver::splitDiagonals
 (
     const scalar featureCos,
     const scalar concaveCos,
@@ -1966,7 +1966,7 @@ void Foam::autoSnapDriver::splitDiagonals
 }
 
 
-void Foam::autoSnapDriver::avoidDiagonalAttraction
+void Foam::snappySnapDriver::avoidDiagonalAttraction
 (
     const label iter,
     const scalar featureCos,
@@ -2065,7 +2065,7 @@ void Foam::autoSnapDriver::avoidDiagonalAttraction
 
 
 Foam::Tuple2<Foam::label, Foam::pointIndexHit>
-Foam::autoSnapDriver::findNearFeatureEdge
+Foam::snappySnapDriver::findNearFeatureEdge
 (
     const bool isRegionEdge,
 
@@ -2132,7 +2132,7 @@ Foam::autoSnapDriver::findNearFeatureEdge
 
 
 Foam::Tuple2<Foam::label, Foam::pointIndexHit>
-Foam::autoSnapDriver::findNearFeaturePoint
+Foam::snappySnapDriver::findNearFeaturePoint
 (
     const bool isRegionPoint,
 
@@ -2238,7 +2238,7 @@ Foam::autoSnapDriver::findNearFeaturePoint
 
 // Determines for every pp point - that is on multiple faces that form
 // a feature - the nearest feature edge/point.
-void Foam::autoSnapDriver::determineFeatures
+void Foam::snappySnapDriver::determineFeatures
 (
     const label iter,
     const scalar featureCos,
@@ -2780,7 +2780,7 @@ void Foam::autoSnapDriver::determineFeatures
 // detected anything. So explicitly pick up feature edges on the pp
 // (after duplicating points & smoothing so will already have been
 // expanded) and match these to the features.
-void Foam::autoSnapDriver::determineBaffleFeatures
+void Foam::snappySnapDriver::determineBaffleFeatures
 (
     const label iter,
     const bool baffleFeaturePoints,
@@ -3108,7 +3108,7 @@ void Foam::autoSnapDriver::determineBaffleFeatures
 }
 
 
-void Foam::autoSnapDriver::reverseAttractMeshPoints
+void Foam::snappySnapDriver::reverseAttractMeshPoints
 (
     const label iter,
 
@@ -3369,7 +3369,7 @@ void Foam::autoSnapDriver::reverseAttractMeshPoints
 }
 
 
-void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
+void Foam::snappySnapDriver::featureAttractionUsingFeatureEdges
 (
     const label iter,
     const bool multiRegionFeatureSnap,
@@ -3667,7 +3667,7 @@ void Foam::autoSnapDriver::featureAttractionUsingFeatureEdges
 
 
 // Correct for squeezing of face
-void Foam::autoSnapDriver::preventFaceSqueeze
+void Foam::snappySnapDriver::preventFaceSqueeze
 (
     const label iter,
     const scalar featureCos,
@@ -3803,7 +3803,7 @@ void Foam::autoSnapDriver::preventFaceSqueeze
 }
 
 
-Foam::vectorField Foam::autoSnapDriver::calcNearestSurfaceFeature
+Foam::vectorField Foam::snappySnapDriver::calcNearestSurfaceFeature
 (
     const snapParameters& snapParams,
     const bool alignMeshEdges,

src/mesh/snappyHexMesh/snappyHexMeshDriver/snappySnapDriverTemplates.C

@@ -23,12 +23,12 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "autoSnapDriver.H"
+#include "snappySnapDriver.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class FaceList>
-Foam::labelList Foam::autoSnapDriver::getFacePoints
+Foam::labelList Foam::snappySnapDriver::getFacePoints
 (
     const indirectPrimitivePatch& pp,
     const FaceList& faces